diff --git a/source/player/player.cpp b/source/player/player.cpp index 0053f57ec..528afacf8 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -17,10 +17,6 @@ #include "player\player.h" -#ifndef __ANIM_HEADER__ -#include "gfx\anim.h" -#endif - #ifndef __PAD_PADS_H__ #include "pad\pads.h" #endif @@ -37,6 +33,10 @@ #include "level\collision.h" #endif +#ifndef __PLAYER_PMODES_H__ +#include "player\pmodes.h" +#endif + // to be removed #include "gfx\tpage.h" @@ -95,6 +95,8 @@ POWER-UPS // render // states setState() // metrics getMetrics() +// override setAnimNo,setAnimFrame? + /*---------------------------------------------------------------------- Function Prototypes @@ -203,10 +205,8 @@ void CPlayer::init() m_layerCollision=NULL; - sActorHdr *Hdr=m_skel.Load(ACTORS_SPONGEBOB_A3D); - m_skel.Init(Hdr); + m_skel.Init(ACTORS_SPONGEBOB_A3D); 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) diff --git a/source/player/player.h b/source/player/player.h index 74a8a266b..458e70ad8 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -30,10 +30,6 @@ #include #endif -#ifndef __PLAYER_PMODES_H__ -#include "player\pmodes.h" -#endif - #ifndef __PLAYER_PSTATES_H__ #include "player\pstates.h" #endif diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index d91e2a38f..d5e24978d 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -1072,6 +1072,18 @@ SOURCE=..\..\..\source\thing\thing.cpp SOURCE=..\..\..\source\thing\thing.h # End Source File # 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" # PROP Default_Filter ""