From 76393c2c65a8523c8b44238f97cc0d69de02e3c8 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 4 Apr 2001 15:40:38 +0000 Subject: [PATCH] --- makefile.gaz | 1 + source/player/player.h | 1 + source/player/pmcoral.cpp | 5 +++++ source/player/pmodes.cpp | 7 ++++++- users/paul/spongebob project/spongebob project.dsp | 8 ++++++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/makefile.gaz b/makefile.gaz index c0e70f5f1..8f683e9b0 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -165,6 +165,7 @@ player_src := demoplay \ psbutt \ psduck \ psfall \ + pshitgnd \ psidle \ psjump \ psrun diff --git a/source/player/player.h b/source/player/player.h index 53c8d7556..1f2cade41 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -70,6 +70,7 @@ typedef enum STATE_RUN, STATE_FALL, STATE_FALLFAR, + STATE_HITGROUND, STATE_BUTTBOUNCE, STATE_BUTTFALL, STATE_BUTTLAND, diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp index 13816c81c..e6a32e4de 100644 --- a/source/player/pmcoral.cpp +++ b/source/player/pmcoral.cpp @@ -34,6 +34,10 @@ #include "player\psfall.h" #endif +#ifndef __PLAYER__PSHITGND_H__ +#include "player\pshitgnd.h" +#endif + #ifndef __PLAYER__PSIDLE_H__ #include "player\psidle.h" #endif @@ -82,6 +86,7 @@ static CPlayerState *s_stateTable[]= &s_stateWalk, // STATE_RUN &s_stateFall, // STATE_FALL &s_stateFallFar, // STATE_FALLFAR + &s_stateHitGround, // STATE_HITGROUND NULL, // STATE_BUTTBOUNCE NULL, // STATE_BUTTFALL NULL, // STATE_BUTTLAND diff --git a/source/player/pmodes.cpp b/source/player/pmodes.cpp index 4eed40ead..fded32a9a 100644 --- a/source/player/pmodes.cpp +++ b/source/player/pmodes.cpp @@ -42,6 +42,10 @@ #include "player\psfall.h" #endif +#ifndef __PLAYER__PSHITGND_H__ +#include "player\pshitgnd.h" +#endif + #ifndef __PLAYER__PSIDLE_H__ #include "player\psidle.h" #endif @@ -90,6 +94,7 @@ static CPlayerState *s_stateTable[]= &s_stateRun, // STATE_RUN &s_stateFall, // STATE_FALL &s_stateFallFar, // STATE_FALLFAR + &s_stateHitGround, // STATE_HITGROUND &s_stateButtBounce, // STATE_BUTTBOUNCE &s_stateButtBounceFall, // STATE_BUTTFALL &s_stateButtBounceLand, // STATE_BUTTLAND @@ -409,7 +414,7 @@ void CPlayerModeBase::playerHasHitGround() else if(m_currentState==STATE_FALLFAR) { // Landed from a painfully long fall - setState(STATE_GETUP); + setState(STATE_HITGROUND); m_player->takeDamage(DAMAGE__FALL); m_moveVelocity.vx=0; CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_LAND_AFTER_FALL); diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 6226e6868..f7d597347 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -803,6 +803,14 @@ SOURCE=..\..\..\source\player\psfall.h # End 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 # End Source File # Begin Source File