This commit is contained in:
parent
6c7ad5a2ef
commit
76393c2c65
5 changed files with 21 additions and 1 deletions
|
@ -165,6 +165,7 @@ player_src := demoplay \
|
||||||
psbutt \
|
psbutt \
|
||||||
psduck \
|
psduck \
|
||||||
psfall \
|
psfall \
|
||||||
|
pshitgnd \
|
||||||
psidle \
|
psidle \
|
||||||
psjump \
|
psjump \
|
||||||
psrun
|
psrun
|
||||||
|
|
|
@ -70,6 +70,7 @@ typedef enum
|
||||||
STATE_RUN,
|
STATE_RUN,
|
||||||
STATE_FALL,
|
STATE_FALL,
|
||||||
STATE_FALLFAR,
|
STATE_FALLFAR,
|
||||||
|
STATE_HITGROUND,
|
||||||
STATE_BUTTBOUNCE,
|
STATE_BUTTBOUNCE,
|
||||||
STATE_BUTTFALL,
|
STATE_BUTTFALL,
|
||||||
STATE_BUTTLAND,
|
STATE_BUTTLAND,
|
||||||
|
|
|
@ -34,6 +34,10 @@
|
||||||
#include "player\psfall.h"
|
#include "player\psfall.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __PLAYER__PSHITGND_H__
|
||||||
|
#include "player\pshitgnd.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __PLAYER__PSIDLE_H__
|
#ifndef __PLAYER__PSIDLE_H__
|
||||||
#include "player\psidle.h"
|
#include "player\psidle.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -82,6 +86,7 @@ static CPlayerState *s_stateTable[]=
|
||||||
&s_stateWalk, // STATE_RUN
|
&s_stateWalk, // STATE_RUN
|
||||||
&s_stateFall, // STATE_FALL
|
&s_stateFall, // STATE_FALL
|
||||||
&s_stateFallFar, // STATE_FALLFAR
|
&s_stateFallFar, // STATE_FALLFAR
|
||||||
|
&s_stateHitGround, // STATE_HITGROUND
|
||||||
NULL, // STATE_BUTTBOUNCE
|
NULL, // STATE_BUTTBOUNCE
|
||||||
NULL, // STATE_BUTTFALL
|
NULL, // STATE_BUTTFALL
|
||||||
NULL, // STATE_BUTTLAND
|
NULL, // STATE_BUTTLAND
|
||||||
|
|
|
@ -42,6 +42,10 @@
|
||||||
#include "player\psfall.h"
|
#include "player\psfall.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __PLAYER__PSHITGND_H__
|
||||||
|
#include "player\pshitgnd.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __PLAYER__PSIDLE_H__
|
#ifndef __PLAYER__PSIDLE_H__
|
||||||
#include "player\psidle.h"
|
#include "player\psidle.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -90,6 +94,7 @@ static CPlayerState *s_stateTable[]=
|
||||||
&s_stateRun, // STATE_RUN
|
&s_stateRun, // STATE_RUN
|
||||||
&s_stateFall, // STATE_FALL
|
&s_stateFall, // STATE_FALL
|
||||||
&s_stateFallFar, // STATE_FALLFAR
|
&s_stateFallFar, // STATE_FALLFAR
|
||||||
|
&s_stateHitGround, // STATE_HITGROUND
|
||||||
&s_stateButtBounce, // STATE_BUTTBOUNCE
|
&s_stateButtBounce, // STATE_BUTTBOUNCE
|
||||||
&s_stateButtBounceFall, // STATE_BUTTFALL
|
&s_stateButtBounceFall, // STATE_BUTTFALL
|
||||||
&s_stateButtBounceLand, // STATE_BUTTLAND
|
&s_stateButtBounceLand, // STATE_BUTTLAND
|
||||||
|
@ -409,7 +414,7 @@ void CPlayerModeBase::playerHasHitGround()
|
||||||
else if(m_currentState==STATE_FALLFAR)
|
else if(m_currentState==STATE_FALLFAR)
|
||||||
{
|
{
|
||||||
// Landed from a painfully long fall
|
// Landed from a painfully long fall
|
||||||
setState(STATE_GETUP);
|
setState(STATE_HITGROUND);
|
||||||
m_player->takeDamage(DAMAGE__FALL);
|
m_player->takeDamage(DAMAGE__FALL);
|
||||||
m_moveVelocity.vx=0;
|
m_moveVelocity.vx=0;
|
||||||
CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_LAND_AFTER_FALL);
|
CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_LAND_AFTER_FALL);
|
||||||
|
|
|
@ -803,6 +803,14 @@ SOURCE=..\..\..\source\player\psfall.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\player\pshitgnd.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\player\pshitgnd.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\source\player\psidle.cpp
|
SOURCE=..\..\..\source\player\psidle.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
Loading…
Add table
Reference in a new issue