This commit is contained in:
parent
b7f4381e01
commit
6f7a6252bc
3 changed files with 19 additions and 11 deletions
|
@ -17,10 +17,6 @@
|
||||||
|
|
||||||
#include "player\player.h"
|
#include "player\player.h"
|
||||||
|
|
||||||
#ifndef __ANIM_HEADER__
|
|
||||||
#include "gfx\anim.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __PAD_PADS_H__
|
#ifndef __PAD_PADS_H__
|
||||||
#include "pad\pads.h"
|
#include "pad\pads.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -37,6 +33,10 @@
|
||||||
#include "level\collision.h"
|
#include "level\collision.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __PLAYER_PMODES_H__
|
||||||
|
#include "player\pmodes.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
// to be removed
|
// to be removed
|
||||||
#include "gfx\tpage.h"
|
#include "gfx\tpage.h"
|
||||||
|
|
||||||
|
@ -95,6 +95,8 @@ POWER-UPS
|
||||||
// render
|
// render
|
||||||
// states setState()
|
// states setState()
|
||||||
// metrics getMetrics()
|
// metrics getMetrics()
|
||||||
|
// override setAnimNo,setAnimFrame?
|
||||||
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------
|
/*----------------------------------------------------------------------
|
||||||
Function Prototypes
|
Function Prototypes
|
||||||
|
@ -203,10 +205,8 @@ void CPlayer::init()
|
||||||
|
|
||||||
m_layerCollision=NULL;
|
m_layerCollision=NULL;
|
||||||
|
|
||||||
sActorHdr *Hdr=m_skel.Load(ACTORS_SPONGEBOB_A3D);
|
m_skel.Init(ACTORS_SPONGEBOB_A3D);
|
||||||
m_skel.Init(Hdr);
|
|
||||||
TPLoadTex(ACTORS_ACTOR_SPONGEBOB_TEX);
|
TPLoadTex(ACTORS_ACTOR_SPONGEBOB_TEX);
|
||||||
m_skel.setAnimDatabase(CAnimDB::Load(ACTORS_SPONGEBOB_ABK));
|
|
||||||
|
|
||||||
|
|
||||||
// Temporary default respawn pos... should realy be set with setRespawnPos() from the level (pkg)
|
// Temporary default respawn pos... should realy be set with setRespawnPos() from the level (pkg)
|
||||||
|
|
|
@ -30,10 +30,6 @@
|
||||||
#include <dstructs.h>
|
#include <dstructs.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __PLAYER_PMODES_H__
|
|
||||||
#include "player\pmodes.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __PLAYER_PSTATES_H__
|
#ifndef __PLAYER_PSTATES_H__
|
||||||
#include "player\pstates.h"
|
#include "player\pstates.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1072,6 +1072,18 @@ SOURCE=..\..\..\source\thing\thing.cpp
|
||||||
SOURCE=..\..\..\source\thing\thing.h
|
SOURCE=..\..\..\source\thing\thing.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Group
|
# End Group
|
||||||
|
# Begin Group "triggers"
|
||||||
|
|
||||||
|
# PROP Default_Filter ""
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\triggers\tlevexit.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\triggers\tlevexit.h
|
||||||
|
# End Source File
|
||||||
|
# End Group
|
||||||
# Begin Group "utils"
|
# Begin Group "utils"
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
# PROP Default_Filter ""
|
||||||
|
|
Loading…
Add table
Reference in a new issue