diff --git a/makefile.gaz b/makefile.gaz index daaf7617e..3ed7a5bc9 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -256,7 +256,7 @@ player_src := demoplay \ pmjelly \ pmnet \ psbutt \ - pscrouch \ + pslook \ psduck \ psfall \ pshitgnd \ diff --git a/source/player/player.h b/source/player/player.h index ca68f58ec..82ee3e985 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -79,8 +79,8 @@ typedef enum STATE_DUCK, STATE_SOAKUP, STATE_GETUP, - STATE_CROUCHDOWN, - STATE_CROUCHUP, + STATE_LOOKDOWN, + STATE_LOOKDOWNRELAX, STATE_JUMPBACK, NUM_STATES, diff --git a/source/player/pmbubble.cpp b/source/player/pmbubble.cpp index 0950b62c5..c033c849d 100644 --- a/source/player/pmbubble.cpp +++ b/source/player/pmbubble.cpp @@ -211,8 +211,8 @@ int CPlayerModeBubbleMixture::canBlowBubbleFromThisState() case STATE_DUCK: case STATE_SOAKUP: case STATE_GETUP: - case STATE_CROUCHDOWN: - case STATE_CROUCHUP: + case STATE_LOOKDOWN: + case STATE_LOOKDOWNRELAX: case STATE_JUMPBACK: break; } diff --git a/source/player/pmchop.cpp b/source/player/pmchop.cpp index 57522a11a..6e00119b0 100644 --- a/source/player/pmchop.cpp +++ b/source/player/pmchop.cpp @@ -196,8 +196,8 @@ int CPlayerModeChop::canAttackFromThisState() case STATE_DUCK: case STATE_SOAKUP: case STATE_GETUP: - case STATE_CROUCHDOWN: - case STATE_CROUCHUP: + case STATE_LOOKDOWN: + case STATE_LOOKDOWNRELAX: case STATE_JUMPBACK: break; } diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp index 9d1270253..5e007af37 100644 --- a/source/player/pmcoral.cpp +++ b/source/player/pmcoral.cpp @@ -22,8 +22,8 @@ #endif // States -#ifndef __PLAYER__PSCROUCH_H__ -#include "player\pscrouch.h" +#ifndef __PLAYER__PSLOOK_H__ +#include "player\pslook.h" #endif #ifndef __PLAYER__PSJUMP_H__ @@ -127,8 +127,8 @@ static CPlayerState *s_stateTable[]= NULL, // STATE_DUCK NULL, // STATE_SOAKUP &s_stateGetUp, // STATE_GETUP - &s_stateCrouchDown, // STATE_CROUCHDOWN - &s_stateCrouchUp, // STATE_CROUCHUP + &s_stateLookDown, // STATE_LOOKDOWN + &s_stateLookDownRelax, // STATE_LOOKDOWNRELAX &s_stateJumpBack, // STATE_JUMPBACK }; diff --git a/source/player/pmjelly.cpp b/source/player/pmjelly.cpp index 14d819847..0b5f49824 100644 --- a/source/player/pmjelly.cpp +++ b/source/player/pmjelly.cpp @@ -215,8 +215,8 @@ int CPlayerModeJellyLauncher::setState(int _state) case STATE_DUCK: case STATE_SOAKUP: case STATE_GETUP: - case STATE_CROUCHDOWN: - case STATE_CROUCHUP: + case STATE_LOOKDOWN: + case STATE_LOOKDOWNRELAX: allowChange=false; break; } @@ -261,8 +261,8 @@ int CPlayerModeJellyLauncher::canFireFromThisState() case STATE_DUCK: case STATE_SOAKUP: case STATE_GETUP: - case STATE_CROUCHDOWN: - case STATE_CROUCHUP: + case STATE_LOOKDOWN: + case STATE_LOOKDOWNRELAX: case STATE_JUMPBACK: break; } diff --git a/source/player/pmnet.cpp b/source/player/pmnet.cpp index da276f8c9..e13178c56 100644 --- a/source/player/pmnet.cpp +++ b/source/player/pmnet.cpp @@ -352,8 +352,8 @@ int CPlayerModeNet::canSwingNetFromThisState() case STATE_DUCK: case STATE_SOAKUP: case STATE_GETUP: - case STATE_CROUCHDOWN: - case STATE_CROUCHUP: + case STATE_LOOKDOWN: + case STATE_LOOKDOWNRELAX: case STATE_JUMPBACK: break; } diff --git a/source/player/pmodes.cpp b/source/player/pmodes.cpp index c4f313bdb..fe174609a 100644 --- a/source/player/pmodes.cpp +++ b/source/player/pmodes.cpp @@ -30,8 +30,8 @@ #endif // States -#ifndef __PLAYER__PSCROUCH_H__ -#include "player\pscrouch.h" +#ifndef __PLAYER__PSLOOK_H__ +#include "player\pslook.h" #endif #ifndef __PLAYER__PSJUMP_H__ @@ -115,8 +115,8 @@ static CPlayerState *s_stateTable[]= &s_stateDuck, // STATE_DUCK &s_stateSoakUp, // STATE_SOAKUP &s_stateGetUp, // STATE_GETUP - &s_stateCrouchDown, // STATE_CROUCHDOWN - &s_stateCrouchUp, // STATE_CROUCHUP + &s_stateLookDown, // STATE_LOOKDOWN + &s_stateLookDownRelax, // STATE_LOOKDOWNRELAX &s_stateJumpBack, // STATE_JUMPBACK }; @@ -220,7 +220,7 @@ int CPlayerModeBase::canDoLookAround() case STATE_IDLE: case STATE_IDLETEETER: case STATE_SOAKUP: - case STATE_CROUCHDOWN: + case STATE_LOOKDOWN: ret=true; break; @@ -236,7 +236,7 @@ int CPlayerModeBase::canDoLookAround() case STATE_BUTTBOUNCEUP: case STATE_DUCK: case STATE_GETUP: - case STATE_CROUCHUP: + case STATE_LOOKDOWNRELAX: case STATE_JUMPBACK: break; } @@ -273,8 +273,8 @@ ATTACK_STATE CPlayerModeBase::getAttackState() case STATE_DUCK: case STATE_SOAKUP: case STATE_GETUP: - case STATE_CROUCHDOWN: - case STATE_CROUCHUP: + case STATE_LOOKDOWN: + case STATE_LOOKDOWNRELAX: case STATE_JUMPBACK: break; } diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp index 73331e694..0f39c825e 100644 --- a/source/player/psidle.cpp +++ b/source/player/psidle.cpp @@ -87,7 +87,7 @@ void CPlayerStateBaseIdle::thinkControl(CPlayerModeBase *_playerMode) } else if(controlHeld&PI_DOWN&&_playerMode->canDoLookAround()) { - _playerMode->setState(STATE_CROUCHDOWN); + _playerMode->setState(STATE_LOOKDOWN); } } diff --git a/source/player/psrun.cpp b/source/player/psrun.cpp index eafe9604b..2e74e2114 100644 --- a/source/player/psrun.cpp +++ b/source/player/psrun.cpp @@ -117,7 +117,7 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode) } if(controlDown&PI_DOWN) { - switchedState=_playerMode->setState(STATE_CROUCHDOWN); + switchedState=_playerMode->setState(STATE_LOOKDOWN); } if(controlHeld&PI_LEFT) diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 6c1640c58..abc785019 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -1507,14 +1507,6 @@ SOURCE=..\..\..\source\player\psbutt.h # End Source File # Begin Source File -SOURCE=..\..\..\source\player\pscrouch.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\player\pscrouch.h -# End Source File -# Begin Source File - SOURCE=..\..\..\source\player\psduck.cpp # End Source File # Begin Source File @@ -1563,6 +1555,14 @@ SOURCE=..\..\..\source\player\psjump.h # End Source File # Begin Source File +SOURCE=..\..\..\source\player\pslook.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\player\pslook.h +# End Source File +# Begin Source File + SOURCE=..\..\..\source\player\psrun.cpp # End Source File # Begin Source File