This commit is contained in:
parent
eb9fbc0473
commit
ef5c8d8b28
15 changed files with 152 additions and 54 deletions
|
@ -61,6 +61,7 @@
|
|||
CPlayerStateJumpBack s_stateJumpBack;
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
Function:
|
||||
Purpose:
|
||||
|
@ -69,10 +70,10 @@ CPlayerStateJumpBack s_stateJumpBack;
|
|||
---------------------------------------------------------------------- */
|
||||
void CPlayerStateJumpBack::enter(CPlayerModeBase *_playerMode)
|
||||
{
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_JUMP);
|
||||
_playerMode->setAnimNo(ANIM_SPONGEBOB_GETHIT);
|
||||
m_reactFrames=0;
|
||||
|
||||
_playerMode->jump();
|
||||
_playerMode->jumpback();
|
||||
|
||||
CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_JUMP);
|
||||
}
|
||||
|
@ -87,15 +88,13 @@ void CPlayerStateJumpBack::enter(CPlayerModeBase *_playerMode)
|
|||
void CPlayerStateJumpBack::think(CPlayerModeBase *_playerMode)
|
||||
{
|
||||
const PlayerMetrics *metrics;
|
||||
int controlHeld,controlDown;
|
||||
int xvel;
|
||||
|
||||
metrics=_playerMode->getPlayerMetrics();
|
||||
controlHeld=_playerMode->getPadInputHeld();
|
||||
controlDown=_playerMode->getPadInputDown();
|
||||
|
||||
_playerMode->advanceAnimFrameAndCheckForEndOfAnim();
|
||||
|
||||
if(m_reactFrames<=metrics->m_metric[PM__MAX_JUMP_FRAMES]&&controlHeld&PI_JUMP)
|
||||
if(m_reactFrames<=metrics->m_metric[PM__HITREACT_FRAMES])
|
||||
{
|
||||
m_reactFrames++;
|
||||
}
|
||||
|
@ -103,24 +102,6 @@ void CPlayerStateJumpBack::think(CPlayerModeBase *_playerMode)
|
|||
{
|
||||
_playerMode->setState(STATE_FALL);
|
||||
}
|
||||
|
||||
if(controlHeld&PI_LEFT)
|
||||
{
|
||||
_playerMode->moveLeft();
|
||||
}
|
||||
else if(controlHeld&PI_RIGHT)
|
||||
{
|
||||
_playerMode->moveRight();
|
||||
}
|
||||
else
|
||||
{
|
||||
_playerMode->slowdown();
|
||||
}
|
||||
|
||||
if(controlDown&PI_DOWN)
|
||||
{
|
||||
_playerMode->setState(STATE_BUTTBOUNCE);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue