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-04-09 20:10:22 +00:00
parent 9b31368d0d
commit 62cac8189d
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
source/player/psfall.cpp
View file

@ -66,7 +66,10 @@ CPlayerStateFallFar s_stateFallFar;
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CPlayerStateFall::enter(CPlayerModeBase *_playerMode) void CPlayerStateFall::enter(CPlayerModeBase *_playerMode)
{ {
if(_playerMode->getAnimNo()!=ANIM_SPONGEBOB_JUMP)
{
_playerMode->setAnimNo(ANIM_SPONGEBOB_JUMP); _playerMode->setAnimNo(ANIM_SPONGEBOB_JUMP);
}
} }
@ -86,6 +89,8 @@ void CPlayerStateFall::think(CPlayerModeBase *_playerMode)
controlHeld=_playerMode->getPadInputHeld(); controlHeld=_playerMode->getPadInputHeld();
controlDown=_playerMode->getPadInputDown(); controlDown=_playerMode->getPadInputDown();
_playerMode->advanceAnimFrameAndCheckForEndOfAnim();
if(controlHeld&PI_LEFT) if(controlHeld&PI_LEFT)
{ {
_playerMode->moveLeft(); _playerMode->moveLeft();

3
source/player/psjump.cpp
View file

@ -94,6 +94,8 @@ void CPlayerStateJump::think(CPlayerModeBase *_playerMode)
controlHeld=_playerMode->getPadInputHeld(); controlHeld=_playerMode->getPadInputHeld();
controlDown=_playerMode->getPadInputDown(); controlDown=_playerMode->getPadInputDown();
_playerMode->advanceAnimFrameAndCheckForEndOfAnim();
if(m_jumpFrames<=metrics->m_metric[PM__MAX_JUMP_FRAMES]&&controlHeld&PI_JUMP) if(m_jumpFrames<=metrics->m_metric[PM__MAX_JUMP_FRAMES]&&controlHeld&PI_JUMP)
{ {
m_jumpFrames++; m_jumpFrames++;
@ -120,7 +122,6 @@ void CPlayerStateJump::think(CPlayerModeBase *_playerMode)
{ {
_playerMode->setState(STATE_BUTTBOUNCE); _playerMode->setState(STATE_BUTTBOUNCE);
} }
// advanceAnimFrameAndCheckForEndOfAnim(_player);
} }

4
source/player/psrun.cpp
View file

@ -98,7 +98,6 @@ void CPlayerStateRun::enter(CPlayerModeBase *_playerMode)
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
int fix=32;
void CPlayerStateRun::think(CPlayerModeBase *_playerMode) void CPlayerStateRun::think(CPlayerModeBase *_playerMode)
{ {
int controlDown,controlHeld; int controlDown,controlHeld;
@ -144,8 +143,7 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode)
} }
} }
if(_playerMode->advanceAnimFrameAndCheckForEndOfAnim()|| if(_playerMode->advanceAnimFrameAndCheckForEndOfAnim())
(_playerMode->getAnimNo()==ANIM_SPONGEBOB_RUN&&_playerMode->getAnimFrame()>=fix))
{ {
_playerMode->setAnimNo(getLoopFrame()); _playerMode->setAnimNo(getLoopFrame());
m_numberOfTimesAnimHasLooped++; m_numberOfTimesAnimHasLooped++;