This commit is contained in:
Paul 2001-01-22 21:02:59 +00:00
parent 4498d072bf
commit 0e76fa991b
11 changed files with 263 additions and 134 deletions

View file

@ -24,6 +24,10 @@
/*----------------------------------------------------------------------*/
PlayerMetrics *CPlayerState::getPlayerMetrics(CPlayer *_player)
{
return _player->getPlayerMetrics();
}
void CPlayerState::setState(CPlayer *_player,int _state)
{
_player->setState((PLAYER_STATE)_state);
@ -117,14 +121,22 @@ void CPlayerStateIdle::think(CPlayer *_player)
int control;
control=getPadInput(_player);
if(control&PAD_CROSS)
if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_JUMP))
{
setState(_player,STATE_JUMP);
}
else if(control&(PAD_LEFT|PAD_RIGHT))
else if(control&(CPadConfig::getButton(CPadConfig::PAD_CFG_LEFT)|CPadConfig::getButton(CPadConfig::PAD_CFG_RIGHT)))
{
setState(_player,STATE_RUN);
}
else if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_ACTION))
{
setState(_player,STATE_CHOP);
}
else if(control&CPadConfig::getButton(CPadConfig::PAD_CFG_DOWN))
{
setState(_player,STATE_DUCK);
}
else if(advanceAnimFrameAndCheckForEndOfAnim(_player))
{
if(getRndRange(100)<95)