zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-01-29 19:23:04 +00:00
parent e0e6d5d853
commit da3fa8f6e9
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/player/player.cpp
View file

@ -146,11 +146,11 @@ void CPlayer::think(int _frames)
Pos.vx+=m_moveVel.vx>>VELOCITY_SHIFT; Pos.vx+=m_moveVel.vx>>VELOCITY_SHIFT;
if(Pos.vx<350) if(Pos.vx<350)
{ {
// if(m_currentState==STATE_RUN) if(m_currentState==STATE_RUN)
// { {
// setState(STATE_IDLE); setState(STATE_IDLE);
// setAnimNo(ANIM_PLAYER_ANIM_RUNSTOP); // setAnimNo(ANIM_PLAYER_ANIM_RUNSTOP);
// } }
Pos.vx=350; Pos.vx=350;
m_moveVel.vx=0; m_moveVel.vx=0;
} }

9
source/player/psidle.cpp
View file

@ -98,6 +98,11 @@ void CPlayerStateIdle::think(CPlayer *_player)
int control; int control;
control=getPadInput(_player); control=getPadInput(_player);
if(advanceAnimFrameAndCheckForEndOfAnim(_player))
{
setNextIdleAnim(_player);
}
if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_JUMP)) if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_JUMP))
{ {
setState(_player,STATE_JUMP); setState(_player,STATE_JUMP);
@ -114,10 +119,6 @@ void CPlayerStateIdle::think(CPlayer *_player)
{ {
setState(_player,STATE_DUCK); setState(_player,STATE_DUCK);
} }
else if(advanceAnimFrameAndCheckForEndOfAnim(_player))
{
setNextIdleAnim(_player);
}
} }

7
source/player/psrun.cpp
View file

@ -106,15 +106,16 @@ void CPlayerStateRun::think(CPlayer *_player)
{ {
setState(_player,STATE_JUMP); setState(_player,STATE_JUMP);
} }
else if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_DOWN)) if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_DOWN))
{ {
setState(_player,STATE_DUCK); setState(_player,STATE_DUCK);
} }
else if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_ACTION)) if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_ACTION))
{ {
setState(_player,STATE_RUNATTACK); setState(_player,STATE_RUNATTACK);
} }
else if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_LEFT))
if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_LEFT))
{ {
moveLeft(_player); moveLeft(_player);
} }