makefile.gaz

@@ -357,7 +357,8 @@ triggers_src :=		trigger \
 					twinddown \
 					twindleft \
 					twindright \
-					toilgeyser
+					toilgeyser \
+					tspeech
 
 
 utils_src :=		utils \

source/triggers/trigger.cpp

@@ -159,6 +159,10 @@
 #include "triggers\tboss.h"
 #endif
 
+#ifndef __TRIGGERS_TSPEECH_H__
+#include "triggers\tspeech.h"
+#endif
+
 #ifndef __GAME_GAME_H__
 #include "game\game.h"
 #endif
@@ -350,6 +354,79 @@ CTrigger	*trigger;
 		case TRIGGER_SECRET_AREA:
 			trigger = (CSecretAreaTrigger*)new("SecretAreaTrigger") CSecretAreaTrigger();
 			break;
+
+		case TRIGGER_SPEECH_FIRST_NET:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
+		case TRIGGER_SPEECH_FIRST_CORAL:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
+		case TRIGGER_SPEECH_GARY_CH2L1:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
+		case TRIGGER_SPEECH_BREAK_FLOOR:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
+		case TRIGGER_SPEECH_BUBBLE_GEYSER:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
+		case TRIGGER_SPEECH_RISING_PLATFORM:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
+		case TRIGGER_SPEECH_FIRST_BUBBLE:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
+		case TRIGGER_SPEECH_USE_BUBBLE:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
+		case TRIGGER_SPEECH_WEIGHT:
+		{
+			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
+			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
+			speechTrigger->setData(0);
+			break;
+		}
+
 		default:
 			trigger=NULL;
 	}

source/triggers/trigger.h

@@ -58,6 +58,15 @@ enum TRIGGER_TYPE
 	TRIGGER_OIL_GEYSER,
 	TRIGGER_BOSS_ARENA,
 	TRIGGER_SECRET_AREA,
+	TRIGGER_SPEECH_FIRST_NET,
+	TRIGGER_SPEECH_FIRST_CORAL,
+	TRIGGER_SPEECH_GARY_CH2L1,
+	TRIGGER_SPEECH_BREAK_FLOOR,
+	TRIGGER_SPEECH_BUBBLE_GEYSER,
+	TRIGGER_SPEECH_RISING_PLATFORM,
+	TRIGGER_SPEECH_FIRST_BUBBLE,
+	TRIGGER_SPEECH_USE_BUBBLE,
+	TRIGGER_SPEECH_WEIGHT,
 
 // Code based triggers
 	TRIGGER_PLATFORM,

tools/Data/bin/MkLevel.ini

@@ -166,6 +166,15 @@ WindRight=31
 OilGeyser=32
 BossArena=33
 SecretArea=34
+SpeechFirstNet=35
+SpeechFirstCoral=36
+SpeechGaryCh2L1=37
+SpeechBreakFloor=38
+SpeechBubbleGeyser=39
+SpeechRisingPlatform=40
+SpeechFirstBubble=41
+SpeechUseBubble=42
+SpeechWeight=43
 
 ################################################
 # FX

tools/MapEdit/trigger.ini

@@ -76,3 +76,21 @@ HasBox=1
 [BossArena]
 
 [SecretArea]
+
+[SpeechFirstNet]
+
+[SpeechFirstCoral]
+
+[SpeechGaryCh2L1]
+
+[SpeechBreakFloor]
+
+[SpeechBubbleGeyser]
+
+[SpeechRisingPlatform]
+
+[SpeechFirstBubble]
+
+[SpeechUseBubble]
+
+[SpeechWeight]

users/paul/spongebob project/spongebob project.dsp

@@ -2481,6 +2481,14 @@ SOURCE=..\..\..\source\triggers\tsleftemit.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\triggers\tspeech.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\triggers\tspeech.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\triggers\tsrightemit.cpp
 # End Source File
 # Begin Source File