zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-05-29 15:54:26 +00:00
parent b22cdf459b
commit 3f4d387a25
11 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
makefile.gaz
View file

@ -256,7 +256,7 @@ player_src := demoplay \
pmjelly \ pmjelly \
pmnet \ pmnet \
psbutt \ psbutt \
pscrouch \ pslook \
psduck \ psduck \
psfall \ psfall \
pshitgnd \ pshitgnd \

4
source/player/player.h
View file

@ -79,8 +79,8 @@ typedef enum
STATE_DUCK, STATE_DUCK,
STATE_SOAKUP, STATE_SOAKUP,
STATE_GETUP, STATE_GETUP,
STATE_CROUCHDOWN, STATE_LOOKDOWN,
STATE_CROUCHUP, STATE_LOOKDOWNRELAX,
STATE_JUMPBACK, STATE_JUMPBACK,
NUM_STATES, NUM_STATES,

4
source/player/pmbubble.cpp
View file

@ -211,8 +211,8 @@ int CPlayerModeBubbleMixture::canBlowBubbleFromThisState()
case STATE_DUCK: case STATE_DUCK:
case STATE_SOAKUP: case STATE_SOAKUP:
case STATE_GETUP: case STATE_GETUP:
case STATE_CROUCHDOWN: case STATE_LOOKDOWN:
case STATE_CROUCHUP: case STATE_LOOKDOWNRELAX:
case STATE_JUMPBACK: case STATE_JUMPBACK:
break; break;
} }

4
source/player/pmchop.cpp
View file

@ -196,8 +196,8 @@ int CPlayerModeChop::canAttackFromThisState()
case STATE_DUCK: case STATE_DUCK:
case STATE_SOAKUP: case STATE_SOAKUP:
case STATE_GETUP: case STATE_GETUP:
case STATE_CROUCHDOWN: case STATE_LOOKDOWN:
case STATE_CROUCHUP: case STATE_LOOKDOWNRELAX:
case STATE_JUMPBACK: case STATE_JUMPBACK:
break; break;
} }

8
source/player/pmcoral.cpp
View file

@ -22,8 +22,8 @@
#endif #endif
// States // States
#ifndef __PLAYER__PSCROUCH_H__ #ifndef __PLAYER__PSLOOK_H__
#include "player\pscrouch.h" #include "player\pslook.h"
#endif #endif
#ifndef __PLAYER__PSJUMP_H__ #ifndef __PLAYER__PSJUMP_H__
@ -127,8 +127,8 @@ static CPlayerState *s_stateTable[]=
NULL, // STATE_DUCK NULL, // STATE_DUCK
NULL, // STATE_SOAKUP NULL, // STATE_SOAKUP
&s_stateGetUp, // STATE_GETUP &s_stateGetUp, // STATE_GETUP
&s_stateCrouchDown, // STATE_CROUCHDOWN &s_stateLookDown, // STATE_LOOKDOWN
&s_stateCrouchUp, // STATE_CROUCHUP &s_stateLookDownRelax, // STATE_LOOKDOWNRELAX
&s_stateJumpBack, // STATE_JUMPBACK &s_stateJumpBack, // STATE_JUMPBACK
}; };

8
source/player/pmjelly.cpp
View file

@ -215,8 +215,8 @@ int CPlayerModeJellyLauncher::setState(int _state)
case STATE_DUCK: case STATE_DUCK:
case STATE_SOAKUP: case STATE_SOAKUP:
case STATE_GETUP: case STATE_GETUP:
case STATE_CROUCHDOWN: case STATE_LOOKDOWN:
case STATE_CROUCHUP: case STATE_LOOKDOWNRELAX:
allowChange=false; allowChange=false;
break; break;
} }
@ -261,8 +261,8 @@ int CPlayerModeJellyLauncher::canFireFromThisState()
case STATE_DUCK: case STATE_DUCK:
case STATE_SOAKUP: case STATE_SOAKUP:
case STATE_GETUP: case STATE_GETUP:
case STATE_CROUCHDOWN: case STATE_LOOKDOWN:
case STATE_CROUCHUP: case STATE_LOOKDOWNRELAX:
case STATE_JUMPBACK: case STATE_JUMPBACK:
break; break;
} }

4
source/player/pmnet.cpp
View file

@ -352,8 +352,8 @@ int CPlayerModeNet::canSwingNetFromThisState()
case STATE_DUCK: case STATE_DUCK:
case STATE_SOAKUP: case STATE_SOAKUP:
case STATE_GETUP: case STATE_GETUP:
case STATE_CROUCHDOWN: case STATE_LOOKDOWN:
case STATE_CROUCHUP: case STATE_LOOKDOWNRELAX:
case STATE_JUMPBACK: case STATE_JUMPBACK:
break; break;
} }

16
source/player/pmodes.cpp
View file

@ -30,8 +30,8 @@
#endif #endif
// States // States
#ifndef __PLAYER__PSCROUCH_H__ #ifndef __PLAYER__PSLOOK_H__
#include "player\pscrouch.h" #include "player\pslook.h"
#endif #endif
#ifndef __PLAYER__PSJUMP_H__ #ifndef __PLAYER__PSJUMP_H__
@ -115,8 +115,8 @@ static CPlayerState *s_stateTable[]=
&s_stateDuck, // STATE_DUCK &s_stateDuck, // STATE_DUCK
&s_stateSoakUp, // STATE_SOAKUP &s_stateSoakUp, // STATE_SOAKUP
&s_stateGetUp, // STATE_GETUP &s_stateGetUp, // STATE_GETUP
&s_stateCrouchDown, // STATE_CROUCHDOWN &s_stateLookDown, // STATE_LOOKDOWN
&s_stateCrouchUp, // STATE_CROUCHUP &s_stateLookDownRelax, // STATE_LOOKDOWNRELAX
&s_stateJumpBack, // STATE_JUMPBACK &s_stateJumpBack, // STATE_JUMPBACK
}; };
@ -220,7 +220,7 @@ int CPlayerModeBase::canDoLookAround()
case STATE_IDLE: case STATE_IDLE:
case STATE_IDLETEETER: case STATE_IDLETEETER:
case STATE_SOAKUP: case STATE_SOAKUP:
case STATE_CROUCHDOWN: case STATE_LOOKDOWN:
ret=true; ret=true;
break; break;
@ -236,7 +236,7 @@ int CPlayerModeBase::canDoLookAround()
case STATE_BUTTBOUNCEUP: case STATE_BUTTBOUNCEUP:
case STATE_DUCK: case STATE_DUCK:
case STATE_GETUP: case STATE_GETUP:
case STATE_CROUCHUP: case STATE_LOOKDOWNRELAX:
case STATE_JUMPBACK: case STATE_JUMPBACK:
break; break;
} }
@ -273,8 +273,8 @@ ATTACK_STATE CPlayerModeBase::getAttackState()
case STATE_DUCK: case STATE_DUCK:
case STATE_SOAKUP: case STATE_SOAKUP:
case STATE_GETUP: case STATE_GETUP:
case STATE_CROUCHDOWN: case STATE_LOOKDOWN:
case STATE_CROUCHUP: case STATE_LOOKDOWNRELAX:
case STATE_JUMPBACK: case STATE_JUMPBACK:
break; break;
} }

2
source/player/psidle.cpp
View file

@ -87,7 +87,7 @@ void CPlayerStateBaseIdle::thinkControl(CPlayerModeBase *_playerMode)
} }
else if(controlHeld&PI_DOWN&&_playerMode->canDoLookAround()) else if(controlHeld&PI_DOWN&&_playerMode->canDoLookAround())
{ {
_playerMode->setState(STATE_CROUCHDOWN); _playerMode->setState(STATE_LOOKDOWN);
} }
} }

2
source/player/psrun.cpp
View file

@ -117,7 +117,7 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode)
} }
if(controlDown&PI_DOWN) if(controlDown&PI_DOWN)
{ {
switchedState=_playerMode->setState(STATE_CROUCHDOWN); switchedState=_playerMode->setState(STATE_LOOKDOWN);
} }
if(controlHeld&PI_LEFT) if(controlHeld&PI_LEFT)

16
users/paul/spongebob project/spongebob project.dsp
View file

@ -1507,14 +1507,6 @@ SOURCE=..\..\..\source\player\psbutt.h
# End Source File # End Source File
# Begin 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 SOURCE=..\..\..\source\player\psduck.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -1563,6 +1555,14 @@ SOURCE=..\..\..\source\player\psjump.h
# End Source File # End Source File
# Begin 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 SOURCE=..\..\..\source\player\psrun.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File