This commit is contained in:
parent
c67894af09
commit
0e48535521
7 changed files with 31 additions and 7 deletions
|
@ -79,6 +79,10 @@
|
||||||
#include "triggers\tbgeyser.h"
|
#include "triggers\tbgeyser.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __TRIGGERS_TSECRET_H__
|
||||||
|
#include "triggers\tsecret.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __TRIGGERS_TSEMIT_H__
|
#ifndef __TRIGGERS_TSEMIT_H__
|
||||||
#include "triggers\tsemit.h"
|
#include "triggers\tsemit.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -340,7 +344,11 @@ CTrigger *trigger;
|
||||||
break;
|
break;
|
||||||
// Boss Arena
|
// Boss Arena
|
||||||
case TRIGGER_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;
|
break;
|
||||||
default:
|
default:
|
||||||
trigger=NULL;
|
trigger=NULL;
|
||||||
|
|
|
@ -57,6 +57,7 @@ enum TRIGGER_TYPE
|
||||||
TRIGGER_WIND_RIGHT,
|
TRIGGER_WIND_RIGHT,
|
||||||
TRIGGER_OIL_GEYSER,
|
TRIGGER_OIL_GEYSER,
|
||||||
TRIGGER_BOSS_ARENA,
|
TRIGGER_BOSS_ARENA,
|
||||||
|
TRIGGER_SECRET_AREA,
|
||||||
|
|
||||||
// Code based triggers
|
// Code based triggers
|
||||||
TRIGGER_PLATFORM,
|
TRIGGER_PLATFORM,
|
||||||
|
|
|
@ -18,6 +18,10 @@
|
||||||
#include "triggers\trigger.h"
|
#include "triggers\trigger.h"
|
||||||
#include "triggers\tsecret.h"
|
#include "triggers\tsecret.h"
|
||||||
|
|
||||||
|
#ifndef __SOUND_SOUND_H__
|
||||||
|
#include "sound\sound.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* Std Lib
|
/* Std Lib
|
||||||
------- */
|
------- */
|
||||||
|
@ -54,7 +58,7 @@ void CSecretAreaTrigger::collidedWith(CThing *_thisThing)
|
||||||
{
|
{
|
||||||
case TYPE_PLAYER:
|
case TYPE_PLAYER:
|
||||||
{
|
{
|
||||||
CSoundMediator::play
|
CSoundMediator::playSfx(CSoundMediator::SFX_SECRET_AREA);
|
||||||
shutdown();
|
shutdown();
|
||||||
delete this;
|
delete this;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*=========================================================================
|
/*=========================================================================
|
||||||
|
|
||||||
tboss.h
|
tsecret.h
|
||||||
|
|
||||||
Author: PKG
|
Author: PKG
|
||||||
Created:
|
Created:
|
||||||
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
===========================================================================*/
|
===========================================================================*/
|
||||||
|
|
||||||
#ifndef __TRIGGERS_TBOSS_H__
|
#ifndef __TRIGGERS_TSECRET_H__
|
||||||
#define __TRIGGERS_TBOSS_H__
|
#define __TRIGGERS_TSECRET_H__
|
||||||
|
|
||||||
/*----------------------------------------------------------------------
|
/*----------------------------------------------------------------------
|
||||||
Includes
|
Includes
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
Structure defintions
|
Structure defintions
|
||||||
-------------------- */
|
-------------------- */
|
||||||
|
|
||||||
class CBossArenaTrigger : public CTrigger
|
class CSecretAreaTrigger : public CTrigger
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
virtual void collidedWith(CThing *_thisThing);
|
virtual void collidedWith(CThing *_thisThing);
|
||||||
|
@ -51,7 +51,7 @@ protected:
|
||||||
|
|
||||||
/*---------------------------------------------------------------------- */
|
/*---------------------------------------------------------------------- */
|
||||||
|
|
||||||
#endif /* __TRIGGERS_TBOSS_H__ */
|
#endif /* __TRIGGERS_TSECRET_H__ */
|
||||||
|
|
||||||
/*===========================================================================
|
/*===========================================================================
|
||||||
end */
|
end */
|
||||||
|
|
|
@ -164,6 +164,7 @@ WindLeft=30
|
||||||
WindRight=31
|
WindRight=31
|
||||||
OilGeyser=32
|
OilGeyser=32
|
||||||
BossArena=33
|
BossArena=33
|
||||||
|
SecretArea=34
|
||||||
|
|
||||||
################################################
|
################################################
|
||||||
# FX
|
# FX
|
||||||
|
|
|
@ -74,3 +74,5 @@ HasBox=1
|
||||||
[OilGeyser]
|
[OilGeyser]
|
||||||
|
|
||||||
[BossArena]
|
[BossArena]
|
||||||
|
|
||||||
|
[SecretArea]
|
||||||
|
|
|
@ -2413,6 +2413,14 @@ SOURCE=..\..\..\source\triggers\tsdownemit.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin 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
|
SOURCE=..\..\..\source\triggers\tsemit.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue