makefile.gfx

@@ -239,7 +239,9 @@ PICKUP_GFX :=				+spatula +pants +health100 +health50 +health25 +glint1 +glint2
 							+teeth +blower +net
 PICKUP_GFX_IN :=			$(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp)
 
-INGAMEFX_GFX_TRANS :=		+bubble_1 +bubble_2 +bubble_3
+INGAMEFX_GFX_TRANS :=		+bubble_1 +bubble_2 +bubble_3 \
+							+health_full_1 +health_full_2 +health_full_3 +health_full_4 +health_full_5 \
+							+health_empty_1 +health_empty_2 +health_empty_3 +health_empty_4 +health_empty_5
 INGAMEFX_GFX_TRANS_IN :=	$(foreach FILE,$(INGAMEFX_GFX_TRANS),$(INGAMEFX_GFX_DIR)/$(FILE).bmp)
 
 ####

source/player/player.cpp

@@ -83,6 +83,11 @@
 /*	Data
 	---- */
 
+#ifndef __SPR_INGAMEFX_H__
+#include <ingamefx.h>
+#endif
+
+
 /*----------------------------------------------------------------------
 	Tyepdefs && Defines
 	------------------- */
@@ -391,14 +396,11 @@ else if(Pos.vy>m_mapEdge.vy-64)Pos.vy=m_mapEdge.vy-64;
   ---------------------------------------------------------------------- */
 int panim=-1;
 #include "gfx\prim.h"	// (pkg)
-int healthx=100;
-int healthy=27;
-int healthw=10;
-int healthh=10;
-int healthg=2;
-int livesx=162;
-int livesy=28;
-
+int healthx=400;
+int healthy=30;
+int healthr=200;
+int healthg=75;
+int healthb=75;
 
 #ifdef __USER_paul__
 int mouth=-1,eyes=-1;
@@ -432,38 +434,49 @@ m_fontBank->print(40,40,posBuf);
 #endif
 
 
-	// Temporary health/lives thing
-#ifdef __USER_paul__
-	int i,x;
-	x=healthx;
-	for(i=0;i<5;i++)
+	// Health
 	{
-		POLY_F4	*f4;
-		f4=GetPrimF4();
-		setXYWH(f4,x,healthy,healthw,healthh);
-		if(i<s_health)
+		static int	s_fullHealthFrames[]=
 		{
-			setRGB0(f4,0,255,0);
+			FRM__HEALTH_FULL_1,
+			FRM__HEALTH_FULL_2,
+			FRM__HEALTH_FULL_3,
+			FRM__HEALTH_FULL_4,
+			FRM__HEALTH_FULL_5,
+		};
+		static int	s_emptyHealthFrames[]=
+		{
+			FRM__HEALTH_EMPTY_1,
+			FRM__HEALTH_EMPTY_2,
+			FRM__HEALTH_EMPTY_3,
+			FRM__HEALTH_EMPTY_4,
+			FRM__HEALTH_EMPTY_5,
+		};
+		int			i,x,y;
+		POLY_FT4	*ft4;
+		int			*frames;
+
+		x=healthx;
+		y=healthy;
+		if(s_health)
+		{
+			frames=s_fullHealthFrames;
 		}
 		else
 		{
-			setRGB0(f4,255,0,0);
+			frames=s_emptyHealthFrames;
 		}
-		setSemiTrans(f4,true);
-		AddPrimToList(f4,0);
 
-		f4=GetPrimF4();
-		setXYWH(f4,x+1,healthy+1,healthw,healthh);
-		setRGB0(f4,0,0,0);
-		setSemiTrans(f4,true);
-		AddPrimToList(f4,1);
-
-		x+=healthw+healthg;
+		for(i=5;i>0;i--)
+		{
+			ft4=m_spriteBank->printFT4(*frames++,x,y,0,0,5);
+			if(i>s_health)
+			{
+				setRGB0(ft4,healthr,healthg,healthb);
+			}
+			y+=9;
+		}
 	}
-	char lifebuf[5];
-	sprintf(lifebuf,"x%d",m_lives);
-	m_fontBank->print(livesx,livesy,lifebuf);
-#endif
 
 	// Mode specific ui
 	m_currentPlayerModeClass->renderModeUi();

source/player/psidle.cpp

@@ -85,7 +85,7 @@ void CPlayerStateBaseIdle::thinkControl(CPlayerModeBase *_playerMode)
 		if(_playerMode->canMoveRight())
 			_playerMode->setState(STATE_RUN);
 	}
-	else if(controlHeld&PI_DOWN)
+	else if(controlDown&PI_DOWN)
 	{
 		_playerMode->setState(STATE_DUCK);
 	}

source/player/psrun.cpp

@@ -110,7 +110,7 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode)
 	{
 		switchedState=_playerMode->setState(STATE_JUMP);
 	}
-	if(controlHeld&PI_DOWN)
+	if(controlDown&PI_DOWN)
 	{
 		switchedState=_playerMode->setState(STATE_DUCK);
 	}

users/paul/spongebob project/spongebob project.dsp

@@ -1290,10 +1290,6 @@ SOURCE=..\..\..\out\USA\include\ingamefx.h
 
 SOURCE=..\..\..\out\USA\include\trans.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\..\out\USA\include\UIGfx.h
-# End Source File
 # End Group
 # End Group
 # End Group