diff --git a/source/player/player.cpp b/source/player/player.cpp index 0360bab09..dcd637e70 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -195,7 +195,7 @@ if(newmode!=-1) else if(m_moveVel.vx) { setState(STATE_RUN); - setAnimNo(ANIM_PLAYER_ANIM_RUNJUMPEND); +// setAnimNo(ANIM_PLAYER_ANIM_RUNJUMPEND); } else { diff --git a/source/player/psbutt.cpp b/source/player/psbutt.cpp index 9d803a32c..9e983c0e3 100644 --- a/source/player/psbutt.cpp +++ b/source/player/psbutt.cpp @@ -67,7 +67,7 @@ ---------------------------------------------------------------------- */ void CPlayerStateButtBounce::enter(CPlayer *_player) { - setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCE); + setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCESTART); } @@ -98,7 +98,7 @@ void CPlayerStateButtBounceLand::enter(CPlayer *_player) pos=getPlayerPos(_player); CGameBubicleFactory::spawnBubicles(pos.vx,pos.vy,40,10,CGameBubicleFactory::TYPE_MEDIUM); - setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCE); + setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCEEND); } diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp index 2e8aa2481..76be8ffdc 100644 --- a/source/player/psidle.cpp +++ b/source/player/psidle.cpp @@ -208,9 +208,9 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayer *_player) static IdleAnims s_unarmedIdleAnims[]= { // start frame loop frame end frame loop count - { -1, ANIM_PLAYER_ANIM_IDLEBOOTS, -1, 4 }, - { -1, ANIM_PLAYER_ANIM_IDLECORAL, -1, 10 }, - { -1, ANIM_PLAYER_ANIM_WAKEUP, -1, 1 }, + { -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 4 }, + { -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 10 }, + { -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 1 }, }; static int s_numUnarmedIdleAnims=sizeof(s_unarmedIdleAnims)/sizeof(IdleAnims); IdleAnims *CPlayerStateUnarmedIdle::getIdleAnimsDb(int _animNo) @@ -233,7 +233,7 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims() static IdleAnims s_coralBlowerIdleAnims[]= { // start frame loop frame end frame loop count - { -1, ANIM_PLAYER_ANIM_IDLECORAL, -1, 1 }, + { -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 1 }, }; static int s_numCoralBlowerIdleAnims=sizeof(s_coralBlowerIdleAnims)/sizeof(IdleAnims); IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo) diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 70ac18a51..20e01273c 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -1028,6 +1028,10 @@ SOURCE=..\..\..\out\USA\include\ingamefx.h # End Source File # Begin Source File +SOURCE=..\..\..\out\USA\include\Player_Anim.h +# End Source File +# Begin Source File + SOURCE=..\..\..\out\USA\include\trans.h # End Source File # Begin Source File