This commit is contained in:
Paul 2001-03-02 21:05:35 +00:00
parent 55d7e5a088
commit 30f18026b4

View file

@ -92,20 +92,21 @@ void CPlayerStateRun::enter(CPlayer *_player)
void CPlayerStateRun::think(CPlayer *_player) void CPlayerStateRun::think(CPlayer *_player)
{ {
int controlDown,controlHeld; int controlDown,controlHeld;
int switchedState=false;
controlDown=getPadInputDown(_player); controlDown=getPadInputDown(_player);
controlHeld=getPadInputHeld(_player); controlHeld=getPadInputHeld(_player);
if(controlDown&PI_JUMP) if(controlDown&PI_JUMP)
{ {
setState(_player,STATE_JUMP); switchedState=setState(_player,STATE_JUMP);
} }
if(controlHeld&PI_DOWN) if(controlHeld&PI_DOWN)
{ {
setState(_player,STATE_DUCK); switchedState=setState(_player,STATE_DUCK);
} }
if(controlDown&PI_ACTION) if(controlDown&PI_ACTION)
{ {
setState(_player,STATE_RUNATTACK); switchedState=setState(_player,STATE_RUNATTACK);
} }
if(controlHeld&PI_LEFT) if(controlHeld&PI_LEFT)
@ -119,6 +120,8 @@ void CPlayerStateRun::think(CPlayer *_player)
else else
{ {
if(getMoveVelocity(_player).vx==0) if(getMoveVelocity(_player).vx==0)
{
if(!switchedState)
{ {
setState(_player,STATE_IDLE); setState(_player,STATE_IDLE);
if(m_numberOfTimeAnimHasLooped>=4) if(m_numberOfTimeAnimHasLooped>=4)
@ -126,6 +129,7 @@ void CPlayerStateRun::think(CPlayer *_player)
setAnimNo(_player,ANIM_SPONGEBOB_RUNSTOP); setAnimNo(_player,ANIM_SPONGEBOB_RUNSTOP);
} }
} }
}
else else
{ {
slowdown(_player); slowdown(_player);