diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp index 4133b9078..16ba89bb5 100644 --- a/source/enemy/npc.cpp +++ b/source/enemy/npc.cpp @@ -66,7 +66,7 @@ void CNpcFriend::init() sActorHdr *Hdr=m_skel.Load(ACTORS_SPONGEBOB_A3D); m_skel.Init(Hdr); - TPLoadTex(ACTORS_ACTOR_SPONGEBOB_TEX); + m_actorTPage = TPLoadTex(ACTORS_ACTOR_SPONGEBOB_TEX); m_skel.setAnimDatabase(CAnimDB::Load(ACTORS_SPONGEBOB_ABK)); Pos.vx = 100; @@ -90,6 +90,10 @@ void CNpcFriend::shutdown() { //m_spriteBank->dump(); delete m_spriteBank; + // temporary + //TPFree( m_actorTPage ); + //CAnimDB::Dump( m_data[m_type].animData ); + CNpcThing::shutdown(); } @@ -210,8 +214,9 @@ void CNpcEnemy::init() sActorHdr *Hdr = m_skel.Load( m_data[m_type].skelType ); m_skel.Init( Hdr ); - TPLoadTex( ACTORS_ACTOR_ENEMY_TEX ); + m_actorTPage = TPLoadTex( ACTORS_ACTOR_ENEMY_TEX ); m_skel.setAnimDatabase( CAnimDB::Load( m_data[m_type].animData ) ); + m_skel.setAng(1024); m_animPlaying = true; @@ -445,6 +450,10 @@ void CNpcEnemy::shutdown() { m_npcPath.removeAllWaypoints(); + // temporary + TPFree( m_actorTPage ); + CAnimDB::Dump( m_data[m_type].animData ); + CEnemyThing::shutdown(); } diff --git a/source/enemy/npc.h b/source/enemy/npc.h index 6d279cce7..33066d0c0 100644 --- a/source/enemy/npc.h +++ b/source/enemy/npc.h @@ -50,7 +50,7 @@ public: void init(); void shutdown(); void think(int _frames); - virtual void render(); + void render(); void processEvent( GAME_EVENT evt, CThing *sourceThing ); void setLayerCollision( class CLayerCollision *_layer ) {m_layerCollision=_layer;} @@ -102,6 +102,7 @@ protected: int m_frame; int m_animNo; CSkel m_skel; + TPAGE_DESC m_actorTPage; }; class CNpcEnemy : public CEnemyThing @@ -156,7 +157,7 @@ public: void init(); void shutdown(); void think(int _frames); - virtual void render(); + void render(); void processEvent( GAME_EVENT evt, CThing *sourceThing ); void setLayerCollision( class CLayerCollision *_layer ) {m_layerCollision=_layer;} @@ -483,6 +484,7 @@ protected: int m_frame; int m_animNo; CSkel m_skel; + TPAGE_DESC m_actorTPage; };