This commit is contained in:
parent
f2aae4c8cb
commit
cfa71eca85
@ -195,7 +195,7 @@ if(newmode!=-1)
|
|||||||
else if(m_moveVel.vx)
|
else if(m_moveVel.vx)
|
||||||
{
|
{
|
||||||
setState(STATE_RUN);
|
setState(STATE_RUN);
|
||||||
setAnimNo(ANIM_PLAYER_ANIM_RUNJUMPEND);
|
// setAnimNo(ANIM_PLAYER_ANIM_RUNJUMPEND);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
---------------------------------------------------------------------- */
|
---------------------------------------------------------------------- */
|
||||||
void CPlayerStateButtBounce::enter(CPlayer *_player)
|
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);
|
pos=getPlayerPos(_player);
|
||||||
CGameBubicleFactory::spawnBubicles(pos.vx,pos.vy,40,10,CGameBubicleFactory::TYPE_MEDIUM);
|
CGameBubicleFactory::spawnBubicles(pos.vx,pos.vy,40,10,CGameBubicleFactory::TYPE_MEDIUM);
|
||||||
setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCE);
|
setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCEEND);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -208,9 +208,9 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayer *_player)
|
|||||||
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_PLAYER_ANIM_IDLEBOOTS, -1, 4 },
|
{ -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 4 },
|
||||||
{ -1, ANIM_PLAYER_ANIM_IDLECORAL, -1, 10 },
|
{ -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 10 },
|
||||||
{ -1, ANIM_PLAYER_ANIM_WAKEUP, -1, 1 },
|
{ -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 1 },
|
||||||
};
|
};
|
||||||
static int s_numUnarmedIdleAnims=sizeof(s_unarmedIdleAnims)/sizeof(IdleAnims);
|
static int s_numUnarmedIdleAnims=sizeof(s_unarmedIdleAnims)/sizeof(IdleAnims);
|
||||||
IdleAnims *CPlayerStateUnarmedIdle::getIdleAnimsDb(int _animNo)
|
IdleAnims *CPlayerStateUnarmedIdle::getIdleAnimsDb(int _animNo)
|
||||||
@ -233,7 +233,7 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims()
|
|||||||
static IdleAnims s_coralBlowerIdleAnims[]=
|
static IdleAnims s_coralBlowerIdleAnims[]=
|
||||||
{
|
{
|
||||||
// start frame loop frame end frame loop count
|
// 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);
|
static int s_numCoralBlowerIdleAnims=sizeof(s_coralBlowerIdleAnims)/sizeof(IdleAnims);
|
||||||
IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo)
|
IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo)
|
||||||
|
@ -1028,6 +1028,10 @@ SOURCE=..\..\..\out\USA\include\ingamefx.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\out\USA\include\Player_Anim.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\out\USA\include\trans.h
|
SOURCE=..\..\..\out\USA\include\trans.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
Loading…
Reference in New Issue
Block a user