From 4559c0a192cc1289b876d6d36e514601ea1c72fb Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 3 Aug 2001 19:30:35 +0000 Subject: [PATCH] --- source/enemy/nboss.h | 2 ++ source/enemy/ndogfish.h | 2 +- source/enemy/nfdutch.h | 2 +- source/enemy/nmjfish.h | 2 +- source/enemy/nsshark.h | 2 +- source/enemy/nssnake.h | 2 +- source/game/bosstext.cpp | 8 +++++--- users/paul/spongebob project/spongebob project.dsp | 8 ++++++++ 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/source/enemy/nboss.h b/source/enemy/nboss.h index 90e3a06cd..43fedb55c 100644 --- a/source/enemy/nboss.h +++ b/source/enemy/nboss.h @@ -27,6 +27,8 @@ public: virtual void postInit(); virtual void shutdown(); void think( int _frames ); + virtual void renderOnMapScreen( DVECTOR drawPos ) {;} + protected: void addHealthMeter(); virtual void processShot( int _frames ); diff --git a/source/enemy/ndogfish.h b/source/enemy/ndogfish.h index 2a1a06c21..1342328fb 100644 --- a/source/enemy/ndogfish.h +++ b/source/enemy/ndogfish.h @@ -27,7 +27,7 @@ class CNpcIronDogfishEnemy : public CNpcBossEnemy public: void postInit(); void render(); - void renderOnMapScreen( DVECTOR drawPos ); + virtual void renderOnMapScreen( DVECTOR drawPos ); void shutdown(); protected: void processTimer( int _frames ); diff --git a/source/enemy/nfdutch.h b/source/enemy/nfdutch.h index f90650aaf..f639070cc 100644 --- a/source/enemy/nfdutch.h +++ b/source/enemy/nfdutch.h @@ -25,7 +25,7 @@ public: void think( int _frames ); void postInit(); void render(); - void renderOnMapScreen( DVECTOR drawPos ); + virtual void renderOnMapScreen( DVECTOR drawPos ); void shutdown(); u8 hasBeenAttacked(); protected: diff --git a/source/enemy/nmjfish.h b/source/enemy/nmjfish.h index be63b0010..7853e5bc1 100644 --- a/source/enemy/nmjfish.h +++ b/source/enemy/nmjfish.h @@ -29,7 +29,7 @@ class CNpcMotherJellyfishEnemy : public CNpcBossEnemy public: void postInit(); void render(); - void renderOnMapScreen( DVECTOR drawPos ); + virtual void renderOnMapScreen( DVECTOR drawPos ); void shutdown(); void setupWaypoints( sThingActor *ThisActor ); protected: diff --git a/source/enemy/nsshark.h b/source/enemy/nsshark.h index 688351172..80874c672 100644 --- a/source/enemy/nsshark.h +++ b/source/enemy/nsshark.h @@ -28,7 +28,7 @@ class CNpcSubSharkEnemy : public CNpcBossEnemy public: void postInit(); void render(); - void renderOnMapScreen( DVECTOR drawPos ); + virtual void renderOnMapScreen( DVECTOR drawPos ); void shutdown(); protected: //virtual void processClose( int _frames ); diff --git a/source/enemy/nssnake.h b/source/enemy/nssnake.h index e5717579b..10153fc2c 100644 --- a/source/enemy/nssnake.h +++ b/source/enemy/nssnake.h @@ -59,7 +59,7 @@ public: void postInit(); void shutdown(); void render(); - void renderOnMapScreen( DVECTOR drawPos ); + virtual void renderOnMapScreen( DVECTOR drawPos ); int checkCollisionAgainst(CThing *_thisThing, int _frames); protected: s32 getFrameShift( int _frames ); diff --git a/source/game/bosstext.cpp b/source/game/bosstext.cpp index 425957f19..71f1bab49 100644 --- a/source/game/bosstext.cpp +++ b/source/game/bosstext.cpp @@ -46,6 +46,10 @@ #include "gfx/actor.h" #endif +#ifndef __ENEMY_NBOSS_H__ +#include "enemy\nboss.h" +#endif + /* Std Lib ------- */ @@ -98,7 +102,6 @@ extern CThing *g_bossThing; Params: Returns: ---------------------------------------------------------------------- */ -int forcelevel=0; void CBossText::init() { m_scalableFontBank=new ("font") ScalableFontBank(); @@ -239,8 +242,7 @@ void CBossText::render() // Boss gfx DVECTOR bossPoss; bossPoss=pos; -// g_bossThing; - + ((CNpcBossEnemy*)g_bossThing)->renderOnMapScreen(bossPoss); } else { diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index f043d7d67..6075dbab3 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -737,6 +737,14 @@ SOURCE=..\..\..\source\fx\fxzzzz.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\..\source\game\bosstext.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\game\bosstext.h +# End Source File +# Begin Source File + SOURCE=..\..\..\source\game\convo.cpp # End Source File # Begin Source File