This commit is contained in:
Charles 2001-06-04 14:04:39 +00:00
parent 4ce365f31e
commit 74bea55adc
7 changed files with 28 additions and 6 deletions

View file

@ -297,6 +297,7 @@ triggers_src := trigger \
tplatfrm \ tplatfrm \
tgarygo \ tgarygo \
tfemit \ tfemit \
tbemit \
tifemit \ tifemit \
tggleft \ tggleft \
tggright \ tggright \

View file

@ -2,7 +2,7 @@
tfemit.h tfemit.h
Author: PKG Author: CRB
Created: Created:
Project: Spongebob Project: Spongebob
Purpose: Purpose:

View file

@ -51,6 +51,10 @@
#include "triggers\tifemit.h" #include "triggers\tifemit.h"
#endif #endif
#ifndef __TRIGGERS_TBEMIT_H__
#include "triggers\tbemit.h"
#endif
#ifndef __TRIGGERS_TGGLEFT_H__ #ifndef __TRIGGERS_TGGLEFT_H__
#include "triggers\tggleft.h" #include "triggers\tggleft.h"
#endif #endif
@ -110,11 +114,6 @@ CTrigger *trigger;
trigger=(CGaryStartTrigger*)new("GaryStartTrigger") CGaryStartTrigger(); trigger=(CGaryStartTrigger*)new("GaryStartTrigger") CGaryStartTrigger();
break; break;
// Flame emitter
case TRIGGER_FLAMEEMITTER:
trigger=(CFlameEmitterTrigger*)new( "FlameEmitterTrigger") CFlameEmitterTrigger();
break;
// Gary stop trigger // Gary stop trigger
case TRIGGER_GARYSTOP: case TRIGGER_GARYSTOP:
trigger=(CGaryStopTrigger*)new("GaryStopTrigger") CGaryStopTrigger(); trigger=(CGaryStopTrigger*)new("GaryStopTrigger") CGaryStopTrigger();
@ -130,10 +129,20 @@ CTrigger *trigger;
trigger=(CGaryGoRightTrigger*)new("GaryGoRightTrigger") CGaryGoRightTrigger(); trigger=(CGaryGoRightTrigger*)new("GaryGoRightTrigger") CGaryGoRightTrigger();
break; break;
// Flame emitter
case TRIGGER_FLAMEEMITTER:
trigger=(CFlameEmitterTrigger*)new( "FlameEmitterTrigger") CFlameEmitterTrigger();
break;
case TRIGGER_INTERMITTENTFLAMEEMITTER: case TRIGGER_INTERMITTENTFLAMEEMITTER:
trigger=(CIntermittentFlameEmitterTrigger*)new( "IntermittentFlameEmitterTrigger") CIntermittentFlameEmitterTrigger(); trigger=(CIntermittentFlameEmitterTrigger*)new( "IntermittentFlameEmitterTrigger") CIntermittentFlameEmitterTrigger();
break; break;
// Bubble emitter
case TRIGGER_BUBBLEEMITTER:
trigger=(CBubbleEmitterTrigger*)new( "BubbleEmitterTrigger") CBubbleEmitterTrigger();
break;
case TRIGGER_PLATFORM: case TRIGGER_PLATFORM:
trigger = (CPlatformTrigger*)new ("PlatformTrigger") CPlatformTrigger(); trigger = (CPlatformTrigger*)new ("PlatformTrigger") CPlatformTrigger();
break; break;

View file

@ -35,6 +35,7 @@ enum TRIGGER_TYPE
TRIGGER_GARYSTOP, TRIGGER_GARYSTOP,
TRIGGER_GARYGOLEFT, TRIGGER_GARYGOLEFT,
TRIGGER_GARYGORIGHT, TRIGGER_GARYGORIGHT,
TRIGGER_BUBBLEEMITTER,
// Code based triggers // Code based triggers
TRIGGER_PLATFORM, TRIGGER_PLATFORM,

View file

@ -137,6 +137,7 @@ IntermittentFlameEmitter=8
GaryStop=9 GaryStop=9
GaryGoLeft=10 GaryGoLeft=10
GaryGoRight=11 GaryGoRight=11
BubbleEmitter=12
################################################ ################################################
# FX # FX

View file

@ -25,6 +25,8 @@ HasBox=1
[IntermittentFlameEmitter] [IntermittentFlameEmitter]
[BubbleEmitter]
[GaryStop] [GaryStop]
[GaryGoLeft] [GaryGoLeft]

View file

@ -1909,6 +1909,14 @@ SOURCE=..\..\..\source\thing\thing.h
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\..\..\source\triggers\tbemit.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\triggers\tbemit.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\triggers\tcamlock.cpp SOURCE=..\..\..\source\triggers\tcamlock.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File