This commit is contained in:
Paul 2001-02-26 20:42:25 +00:00
parent 90194896f7
commit 25ce2449ae
24 changed files with 84 additions and 108 deletions

View file

@ -47,8 +47,8 @@
/* Data
---- */
#ifndef __ANIM_PLAYER_ANIM_HEADER__
#include <player_anim.h>
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
@ -178,7 +178,7 @@ void CPlayer::init()
sActorHdr *Hdr=m_skel.Load(ACTORS_SPONGEBOB_A3D);
m_skel.Init(Hdr);
TPLoadTex(ACTORS_SPONGEBOB_TEX);
m_skel.setAnimDatabase(CAnimDB::Load(ANIMS_PLAYER_ABK));
m_skel.setAnimDatabase(CAnimDB::Load(ACTORS_SPONGEBOB_ABK));
// Temporary default respawn pos... should realy be set with setRespawnPos() from the level (pkg)
@ -209,6 +209,9 @@ m_skel.setAng(512);
s_debugFont.initialise(&standardFont);
s_debugFont.setJustification(FontBank::JUST_LEFT);
#endif
setCollisionSize(25,50);
setCollisionCentreOffset(0,-25);
}
/*----------------------------------------------------------------------
@ -405,7 +408,7 @@ void CPlayer::thinkVerticalMovement()
{
// Landed from a jump with no x movement
setState(STATE_IDLE);
setAnimNo(ANIM_PLAYER_ANIM_JUMPEND);
setAnimNo(ANIM_SPONGEBOB_JUMPEND);
}
}
}
@ -1162,6 +1165,5 @@ PLAYERINPUT CPlayer::readPadInput()
return input;
}
/*===========================================================================
end */

View file

@ -18,8 +18,8 @@
Includes
-------- */
#ifndef __GAME_THING_H__
#include "game/thing.h"
#ifndef __THING_TPLAYER_H__
#include "thing/tplayer.h"
#endif
#ifndef __GFX_SKELSPNG_H__
@ -134,7 +134,7 @@ struct PlayerMetrics
};
class CPlayer : public CThing
class CPlayer : public CPlayerThing
{
public:
enum
@ -277,6 +277,7 @@ private:
DVECTOR m_mapCameraEdges;
DVECTOR m_mapEdge;
DVECTOR m_respawnPos;
};