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-10 18:44:12 +00:00
parent 462370140c
commit d9c34ac40a
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/player/pmcoral.cpp
View file

@ -80,8 +80,8 @@
static CPlayerState *s_stateTable[]= static CPlayerState *s_stateTable[]=
{ {
&s_stateCoralBlowerIdle, // STATE_IDLE &s_stateWeaponIdle, // STATE_IDLE
&s_stateCoralBlowerIdle, // STATE_IDLETEETER &s_stateWeaponIdle, // STATE_IDLETEETER
&s_stateJump, // STATE_JUMP &s_stateJump, // STATE_JUMP
&s_stateWalk, // STATE_RUN &s_stateWalk, // STATE_RUN
&s_stateFall, // STATE_FALL &s_stateFall, // STATE_FALL

24
source/player/psidle.cpp
View file

@ -56,7 +56,7 @@
CPlayerStateUnarmedIdle s_stateUnarmedIdle; CPlayerStateUnarmedIdle s_stateUnarmedIdle;
CPlayerStateTeeterIdle s_stateTeeterIdle; CPlayerStateTeeterIdle s_stateTeeterIdle;
CPlayerStateCoralBlowerIdle s_stateCoralBlowerIdle; CPlayerStateWeaponIdle s_stateWeaponIdle;
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -257,8 +257,8 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode)
static IdleAnims s_unarmedIdleAnims[]= static IdleAnims s_unarmedIdleAnims[]=
{ {
// start frame loop frame end frame loop count // start frame loop frame end frame loop count
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 4 }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 15 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 20 },
{ -1, ANIM_SPONGEBOB_IDLEWIND, -1, 1 }, { -1, ANIM_SPONGEBOB_IDLEWIND, -1, 1 },
}; };
@ -280,22 +280,22 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
static IdleAnims s_coralBlowerIdleAnims[]= static IdleAnims s_weaponIdleAnims[]=
{ {
// start frame loop frame end frame loop count // start frame loop frame end frame loop count
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 4 }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 15 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 20 },
// { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 }, { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },
}; };
static int s_numCoralBlowerIdleAnims=sizeof(s_coralBlowerIdleAnims)/sizeof(IdleAnims); static int s_numWeaponIdleAnims=sizeof(s_weaponIdleAnims)/sizeof(IdleAnims);
IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo) IdleAnims *CPlayerStateWeaponIdle::getIdleAnimsDb(int _animNo)
{ {
ASSERT(_animNo<getNumIdleAnims()); ASSERT(_animNo<getNumIdleAnims());
return &s_coralBlowerIdleAnims[_animNo]; return &s_weaponIdleAnims[_animNo];
} }
int CPlayerStateCoralBlowerIdle::getNumIdleAnims() int CPlayerStateWeaponIdle::getNumIdleAnims()
{ {
return s_numCoralBlowerIdleAnims; return s_numWeaponIdleAnims;
} }

4
source/player/psidle.h
View file

@ -94,7 +94,7 @@ private:
}; };
class CPlayerStateCoralBlowerIdle : public CPlayerStateIdle class CPlayerStateWeaponIdle : public CPlayerStateIdle
{ {
private: private:
virtual IdleAnims *getIdleAnimsDb(int _animNo); virtual IdleAnims *getIdleAnimsDb(int _animNo);
@ -109,7 +109,7 @@ private:
extern CPlayerStateUnarmedIdle s_stateUnarmedIdle; extern CPlayerStateUnarmedIdle s_stateUnarmedIdle;
extern CPlayerStateTeeterIdle s_stateTeeterIdle; extern CPlayerStateTeeterIdle s_stateTeeterIdle;
extern CPlayerStateCoralBlowerIdle s_stateCoralBlowerIdle; extern CPlayerStateWeaponIdle s_stateWeaponIdle;
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------