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

Browse source
This commit is contained in:
Daveo 2001-02-26 20:05:31 +00:00
parent 2b96606db2
commit 9638e0c561
12 changed files with 59 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/player/psbutt.cpp
View file

@ -38,8 +38,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -67,7 +67,7 @@
---------------------------------------------------------------------- */
void CPlayerStateButtBounce::enter(CPlayer *_player)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCESTART);
setAnimNo(_player,ANIM_SPONGEBOB_BUTTBOUNCESTART);
}
@ -94,7 +94,7 @@ void CPlayerStateButtBounce::think(CPlayer *_player)
---------------------------------------------------------------------- */
void CPlayerStateButtBounceFall::enter(CPlayer *_player)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_BUTTBOUNCEEND);
setAnimNo(_player,ANIM_SPONGEBOB_BUTTBOUNCEEND);
}

6
source/player/pschop.cpp
View file

@ -34,8 +34,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -63,7 +63,7 @@
---------------------------------------------------------------------- */
void CPlayerStateChop::enter(CPlayer *_player)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_KARATE);
setAnimNo(_player,ANIM_SPONGEBOB_KARATE);
}

6
source/player/psdead.cpp
View file

@ -33,8 +33,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -62,7 +62,7 @@
---------------------------------------------------------------------- */
void CPlayerStateDead::enter(CPlayer *_player)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_DEATHSPIN);
setAnimNo(_player,ANIM_SPONGEBOB_DEATHSPIN);
m_deadCounter=0;
}

10
source/player/psduck.cpp
View file

@ -36,8 +36,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -65,7 +65,7 @@
---------------------------------------------------------------------- */
void CPlayerStateDuck::enter(CPlayer *_player)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_SOAKUP);
setAnimNo(_player,ANIM_SPONGEBOB_SOAKUP);
}
@ -99,7 +99,7 @@ void CPlayerStateSoakUp::enter(CPlayer *_player)
move.vx=0;
setMoveVelocity(_player,&move);
setAnimNo(_player,ANIM_PLAYER_ANIM_GETUP);
setAnimNo(_player,ANIM_SPONGEBOB_GETUP);
}
@ -129,7 +129,7 @@ void CPlayerStateSoakUp::think(CPlayer *_player)
---------------------------------------------------------------------- */
void CPlayerStateGetUp::enter(CPlayer *_player)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_GETUP);
setAnimNo(_player,ANIM_SPONGEBOB_GETUP);
}

8
source/player/psfall.cpp
View file

@ -35,8 +35,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -64,7 +64,7 @@
---------------------------------------------------------------------- */
void CPlayerStateFall::enter(CPlayer *_player)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_HOVER);
setAnimNo(_player,ANIM_SPONGEBOB_HOVER);
}
@ -126,7 +126,7 @@ void CPlayerStateFall::think(CPlayer *_player)
---------------------------------------------------------------------- */
void CPlayerStateFallFar::enter(CPlayer *_player)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_FALL);
setAnimNo(_player,ANIM_SPONGEBOB_FALL);
}

6
source/player/psfly.cpp
View file

@ -35,8 +35,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -69,7 +69,7 @@ void CPlayerStateFly::enter(CPlayer *_player)
move.vx=0;
move.vy=0;
setMoveVelocity(_player,&move);
setAnimNo(_player,ANIM_PLAYER_ANIM_IDLEHOOLA);
setAnimNo(_player,ANIM_SPONGEBOB_IDLEHOOLA);
}

26
source/player/psidle.cpp
View file

@ -37,8 +37,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -111,11 +111,11 @@ void CPlayerStateTeeterIdle::enter(CPlayer *_player)
dir=getFacing(_player);
if(edgeType==FACING_LEFT)
{
anim=dir==FACING_LEFT?ANIM_PLAYER_ANIM_TEETERFRONT:ANIM_PLAYER_ANIM_TEETERBACK;
anim=dir==FACING_LEFT?ANIM_SPONGEBOB_TEETERFRONT:ANIM_SPONGEBOB_TEETERBACK;
}
else
{
anim=dir==FACING_RIGHT?ANIM_PLAYER_ANIM_TEETERFRONT:ANIM_PLAYER_ANIM_TEETERBACK;
anim=dir==FACING_RIGHT?ANIM_SPONGEBOB_TEETERFRONT:ANIM_SPONGEBOB_TEETERBACK;
}
setAnimNo(_player,anim);
@ -262,12 +262,12 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayer *_player)
static IdleAnims s_unarmedIdleAnims[]=
{
// start frame loop frame end frame loop count
{ -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 4 }, // default
{ -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 10 },
{ ANIM_PLAYER_ANIM_FACEFRONT, ANIM_PLAYER_ANIM_IDLEHOOLA, ANIM_PLAYER_ANIM_FACEBACK, 5 },
{ ANIM_PLAYER_ANIM_FACEFRONT, ANIM_PLAYER_ANIM_IDLEWIGGLEARM, ANIM_PLAYER_ANIM_FACEBACK, 5 },
{ -1, ANIM_PLAYER_ANIM_IDLELOOK, -1, 1 },
{ -1, ANIM_PLAYER_ANIM_IDLEWIND, -1, 1 },
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
{ ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEHOOLA, ANIM_SPONGEBOB_FACEBACK, 5 },
{ ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEWIGGLEARM, ANIM_SPONGEBOB_FACEBACK, 5 },
{ -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
{ -1, ANIM_SPONGEBOB_IDLEWIND, -1, 1 },
};
//idlekick
//idlescratch
@ -295,9 +295,9 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims()
static IdleAnims s_coralBlowerIdleAnims[]=
{
// start frame loop frame end frame loop count
{ -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 4 }, // default
{ -1, ANIM_PLAYER_ANIM_IDLEBREATHE, -1, 10 },
{ -1, ANIM_PLAYER_ANIM_IDLELOOK, -1, 1 },
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
{ -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
};
static int s_numCoralBlowerIdleAnims=sizeof(s_coralBlowerIdleAnims)/sizeof(IdleAnims);
IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo)

6
source/player/psjump.cpp
View file

@ -38,8 +38,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -71,7 +71,7 @@ void CPlayerStateJump::enter(CPlayer *_player)
metrics=getPlayerMetrics(_player);
setAnimNo(_player,ANIM_PLAYER_ANIM_HOVER);
setAnimNo(_player,ANIM_SPONGEBOB_HOVER);
m_jumpFrames=0;
DVECTOR move=getMoveVelocity(_player);
move.vy=-metrics->m_metric[PM__JUMP_VELOCITY]<<CPlayer::VELOCITY_SHIFT;

12
source/player/psrun.cpp
View file

@ -37,8 +37,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -71,11 +71,11 @@ void CPlayerStateRun::enter(CPlayer *_player)
if(getMoveVelocity(_player).vx)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_RUN);
setAnimNo(_player,ANIM_SPONGEBOB_RUN);
}
else
{
setAnimNo(_player,ANIM_PLAYER_ANIM_RUNSTART);
setAnimNo(_player,ANIM_SPONGEBOB_RUNSTART);
}
if(controlHeld&PI_LEFT)
@ -131,7 +131,7 @@ void CPlayerStateRun::think(CPlayer *_player)
setState(_player,STATE_IDLE);
if(m_numberOfTimeAnimHasLooped>=4)
{
setAnimNo(_player,ANIM_PLAYER_ANIM_RUNSTOP);
setAnimNo(_player,ANIM_SPONGEBOB_RUNSTOP);
}
}
else
@ -142,7 +142,7 @@ void CPlayerStateRun::think(CPlayer *_player)
if(advanceAnimFrameAndCheckForEndOfAnim(_player))
{
setAnimNo(_player,ANIM_PLAYER_ANIM_RUN);
setAnimNo(_player,ANIM_SPONGEBOB_RUN);
m_numberOfTimeAnimHasLooped++;
}
}

2
source/system/main.cpp
View file

@ -118,7 +118,7 @@ void InitSystem() // reordered to reduce black screen (hope all is well
CBubicleFactory::init();
CAnimDB::Init();
CAnimDB::Load(ANIMS_PLAYER_ABK);
CAnimDB::Load(ACTORS_SPONGEBOB_ABK);
#if defined(__DEBUG_MEM__)
DebugMemFontInit();