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-14 16:43:48 +00:00
parent 116311d028
commit 7f3567eb4e
13 changed files with 53 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
makefile.gaz
View file

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

14
source/player/player.cpp
View file

@ -334,6 +334,8 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_WALK,
-1, // ANIM_SPONGEBOB_KARATE,
ANIM_SPONGEBOB_NET_GETHIT, // ANIM_SPONGEBOB_GETHIT
ANIM_SPONGEBOB_NET_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
ANIM_SPONGEBOB_NET_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
},
// PLAYER_ADDON_CORALBLOWER,
@ -363,6 +365,8 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
ANIM_SPONGEBOB_CORALBLOWER_WALK, // ANIM_SPONGEBOB_WALK,
-1, // ANIM_SPONGEBOB_KARATE,
ANIM_SPONGEBOB_CORALBLOWER_GETHIT, // ANIM_SPONGEBOB_GETHIT
ANIM_SPONGEBOB_CORALBLOWER_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
ANIM_SPONGEBOB_CORALBLOWER_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
},
// PLAYER_ADDON_JELLYLAUNCHER,
@ -392,6 +396,8 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_WALK,
-1, // ANIM_SPONGEBOB_KARATE,
ANIM_SPONGEBOB_JELLYLAUNCHER_GETHIT, // ANIM_SPONGEBOB_GETHIT
ANIM_SPONGEBOB_JELLYLAUNCHER_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
ANIM_SPONGEBOB_JELLYLAUNCHER_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
},
// PLAYER_ADDON_GLASSES,
@ -421,6 +427,8 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
ANIM_SPONGEBOB_GLASSES_WALK, // ANIM_SPONGEBOB_WALK,
ANIM_SPONGEBOB_GLASSES_KARATE, // ANIM_SPONGEBOB_KARATE,
ANIM_SPONGEBOB_GLASSES_GETHIT, // ANIM_SPONGEBOB_GETHIT
ANIM_SPONGEBOB_GLASSES_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
ANIM_SPONGEBOB_GLASSES_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
},
// PLAYER_ADDON_BUBBLEWAND,
@ -450,6 +458,8 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_WALK,
-1, // ANIM_SPONGEBOB_KARATE,
-1, // ANIM_SPONGEBOB_GETHIT
-1, // ANIM_SPONGEBOB_CROUCHDOWN
-1, // ANIM_SPONGEBOB_CROUCHUP
},
// PLAYER_ADDON_JELLYFISHINNET
@ -479,6 +489,8 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_WALK,
-1, // ANIM_SPONGEBOB_KARATE,
ANIM_SPONGEBOB_JELLYFISH_GETHIT, // ANIM_SPONGEBOB_GETHIT
ANIM_SPONGEBOB_JELLYFISH_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
ANIM_SPONGEBOB_JELLYFISH_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
},
// PLAYER_ADDON_GLOVE
@ -508,6 +520,8 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_WALK,
ANIM_SPONGEBOB_GLOVE_KARATE, // ANIM_SPONGEBOB_KARATE,
-1, // ANIM_SPONGEBOB_GETHIT
-1, // ANIM_SPONGEBOB_CROUCHDOWN
-1, // ANIM_SPONGEBOB_CROUCHUP
},
};

2
source/player/player.h
View file

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

2
source/player/pmbubble.cpp
View file

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

2
source/player/pmchop.cpp
View file

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

6
source/player/pmcoral.cpp
View file

@ -22,6 +22,10 @@
#endif
// States
#ifndef __PLAYER__PSCROUCH_H__
#include "player\pscrouch.h"
#endif
#ifndef __PLAYER__PSJUMP_H__
#include "player\psjump.h"
#endif
@ -119,6 +123,8 @@ static CPlayerState *s_stateTable[]=
NULL, // STATE_DUCK
NULL, // STATE_SOAKUP
&s_stateGetUp, // STATE_GETUP
&s_stateCrouchDown, // STATE_CROUCHDOWN
&s_stateCrouchUp, // STATE_CROUCHUP
&s_stateJumpBack, // STATE_JUMPBACK
};

4
source/player/pmjelly.cpp
View file

@ -214,6 +214,8 @@ int CPlayerModeJellyLauncher::setState(int _state)
case STATE_DUCK:
case STATE_SOAKUP:
case STATE_GETUP:
case STATE_CROUCHDOWN:
case STATE_CROUCHUP:
allowChange=false;
break;
}
@ -258,6 +260,8 @@ int CPlayerModeJellyLauncher::canFireFromThisState()
case STATE_DUCK:
case STATE_SOAKUP:
case STATE_GETUP:
case STATE_CROUCHDOWN:
case STATE_CROUCHUP:
case STATE_JUMPBACK:
break;
}

2
source/player/pmnet.cpp
View file

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

10
source/player/pmodes.cpp
View file

@ -30,6 +30,10 @@
#endif
// States
#ifndef __PLAYER__PSCROUCH_H__
#include "player\pscrouch.h"
#endif
#ifndef __PLAYER__PSJUMP_H__
#include "player\psjump.h"
#endif
@ -111,6 +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_stateJumpBack, // STATE_JUMPBACK
};
@ -216,6 +222,7 @@ int CPlayerModeBase::canDoLookAround()
case STATE_IDLE:
case STATE_IDLETEETER:
case STATE_SOAKUP:
case STATE_CROUCHDOWN:
ret=true;
break;
@ -231,6 +238,7 @@ int CPlayerModeBase::canDoLookAround()
case STATE_BUTTBOUNCEUP:
case STATE_DUCK:
case STATE_GETUP:
case STATE_CROUCHUP:
case STATE_JUMPBACK:
break;
}
@ -267,6 +275,8 @@ ATTACK_STATE CPlayerModeBase::getAttackState()
case STATE_DUCK:
case STATE_SOAKUP:
case STATE_GETUP:
case STATE_CROUCHDOWN:
case STATE_CROUCHUP:
case STATE_JUMPBACK:
break;
}

32
source/player/pscrouch.cpp
View file

@ -98,38 +98,6 @@ void CPlayerStateCrouchDown::think(CPlayerModeBase *_playerMode)
}
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CPlayerStateCrouchUp::enter(CPlayerModeBase *_playerMode)
{
_playerMode->zeroMoveVelocity();
_playerMode->setAnimNo(ANIM_SPONGEBOB_SOAKUP);
_playerMode->setAnimFrame(_playerMode->getAnimFrameCount()-1);
_playerMode->setPlayerCollisionSize(0,-10,60,20);
}
/*
void CPlayerStateSoakUp::think(CPlayerModeBase *_playerMode)
{
int controlHeld;
controlHeld=_playerMode->getPadInputHeld();
if(!(controlHeld&PI_DOWN))
{
_playerMode->setState(STATE_GETUP);
}
else
{
_playerMode->inSoakUpState();
}
}
*/
/*----------------------------------------------------------------------
Function:
Purpose:

2
source/player/psidle.cpp
View file

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

2
source/player/psrun.cpp
View file

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

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

@ -1403,6 +1403,14 @@ 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