diff --git a/source/triggers/trigger.cpp b/source/triggers/trigger.cpp index 12671f78c..5b5bbc377 100644 --- a/source/triggers/trigger.cpp +++ b/source/triggers/trigger.cpp @@ -79,6 +79,10 @@ #include "triggers\tbgeyser.h" #endif +#ifndef __TRIGGERS_TSECRET_H__ +#include "triggers\tsecret.h" +#endif + #ifndef __TRIGGERS_TSEMIT_H__ #include "triggers\tsemit.h" #endif @@ -340,7 +344,11 @@ CTrigger *trigger; break; // Boss Arena case TRIGGER_BOSS_ARENA: - trigger = (COilGeyserTrigger*)new("BossArenaTrigger") CBossArenaTrigger(); + trigger = (CBossArenaTrigger*)new("BossArenaTrigger") CBossArenaTrigger(); + break; + // Secret Area + case TRIGGER_SECRET_AREA: + trigger = (CSecretAreaTrigger*)new("SecretAreaTrigger") CSecretAreaTrigger(); break; default: trigger=NULL; diff --git a/source/triggers/trigger.h b/source/triggers/trigger.h index 2ab9f0ac5..6340f2b3b 100644 --- a/source/triggers/trigger.h +++ b/source/triggers/trigger.h @@ -57,6 +57,7 @@ enum TRIGGER_TYPE TRIGGER_WIND_RIGHT, TRIGGER_OIL_GEYSER, TRIGGER_BOSS_ARENA, + TRIGGER_SECRET_AREA, // Code based triggers TRIGGER_PLATFORM, diff --git a/source/triggers/tsecret.cpp b/source/triggers/tsecret.cpp index 8a58bb293..e29e88c55 100644 --- a/source/triggers/tsecret.cpp +++ b/source/triggers/tsecret.cpp @@ -18,6 +18,10 @@ #include "triggers\trigger.h" #include "triggers\tsecret.h" +#ifndef __SOUND_SOUND_H__ +#include "sound\sound.h" +#endif + /* Std Lib ------- */ @@ -54,7 +58,7 @@ void CSecretAreaTrigger::collidedWith(CThing *_thisThing) { case TYPE_PLAYER: { - CSoundMediator::play + CSoundMediator::playSfx(CSoundMediator::SFX_SECRET_AREA); shutdown(); delete this; break; diff --git a/source/triggers/tsecret.h b/source/triggers/tsecret.h index c36edaf06..d46c99c2b 100644 --- a/source/triggers/tsecret.h +++ b/source/triggers/tsecret.h @@ -1,6 +1,6 @@ /*========================================================================= - tboss.h + tsecret.h Author: PKG Created: @@ -11,8 +11,8 @@ ===========================================================================*/ -#ifndef __TRIGGERS_TBOSS_H__ -#define __TRIGGERS_TBOSS_H__ +#ifndef __TRIGGERS_TSECRET_H__ +#define __TRIGGERS_TSECRET_H__ /*---------------------------------------------------------------------- Includes @@ -34,7 +34,7 @@ Structure defintions -------------------- */ -class CBossArenaTrigger : public CTrigger +class CSecretAreaTrigger : public CTrigger { protected: virtual void collidedWith(CThing *_thisThing); @@ -51,7 +51,7 @@ protected: /*---------------------------------------------------------------------- */ -#endif /* __TRIGGERS_TBOSS_H__ */ +#endif /* __TRIGGERS_TSECRET_H__ */ /*=========================================================================== end */ diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini index de52dc063..53bd30e62 100644 --- a/tools/Data/bin/MkLevel.ini +++ b/tools/Data/bin/MkLevel.ini @@ -164,6 +164,7 @@ WindLeft=30 WindRight=31 OilGeyser=32 BossArena=33 +SecretArea=34 ################################################ # FX diff --git a/tools/MapEdit/trigger.ini b/tools/MapEdit/trigger.ini index e14ca0c15..0f5477207 100644 --- a/tools/MapEdit/trigger.ini +++ b/tools/MapEdit/trigger.ini @@ -74,3 +74,5 @@ HasBox=1 [OilGeyser] [BossArena] + +[SecretArea] diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 931206472..8bcd13298 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -2413,6 +2413,14 @@ SOURCE=..\..\..\source\triggers\tsdownemit.h # End Source File # Begin Source File +SOURCE=..\..\..\source\triggers\tsecret.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\triggers\tsecret.h +# End Source File +# Begin Source File + SOURCE=..\..\..\source\triggers\tsemit.cpp # End Source File # Begin Source File