From 5f940ad5bb9786f7f0c1980659825f4c01da5ccd Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Tue, 5 Jun 2001 16:01:22 +0000
Subject: [PATCH]

---
 makefile.gaz                                     |  6 ++++--
 source/hazard/hazard.cpp                         | 11 +++++++++++
 source/hazard/hazard.h                           |  1 +
 source/triggers/trigger.cpp                      |  8 ++++++++
 source/triggers/trigger.h                        |  1 +
 tools/Data/bin/MkLevel.ini                       |  2 +-
 .../paul/spongebob project/spongebob project.dsp | 16 ++++++++++++++++
 7 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/makefile.gaz b/makefile.gaz
index 0521fc221..5272f2710 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -153,7 +153,8 @@ hazard_src :=		hazard \
 					hpswitch \
 					hrckshrd \
 					hinert \
-					hcswitch
+					hcswitch \
+					hbrock
 
 fx_src :=			fx \
 					fxbaseanim \
@@ -306,7 +307,8 @@ triggers_src :=		trigger \
 					tggright \
 					tgstop \
 					thazard \
-					tbgeyser
+					tbgeyser \
+					thazwalk
 
 utils_src :=		utils \
 					sincos \
diff --git a/source/hazard/hazard.cpp b/source/hazard/hazard.cpp
index c7d08c8fd..f8f429afa 100644
--- a/source/hazard/hazard.cpp
+++ b/source/hazard/hazard.cpp
@@ -119,6 +119,10 @@
 #include "hazard\hcswitch.h"
 #endif
 
+#ifndef __HAZARD_HBROCK_H__
+#include "hazard\hbrock.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -146,6 +150,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
 	NPC_ROCKSHARD_HAZARD,
 	NPC_INERT_HAZARD,
 	NPC_CONVEYOR_SWITCH_HAZARD,
+	NPC_BOUNCING_ROCK_HAZARD,
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -290,6 +295,12 @@ CNpcHazard *hazard;
 			break;
 		}
 
+		case NPC_BOUNCING_ROCK_HAZARD:
+		{
+			hazard = new ("bouncing rock hazard") CNpcBouncingRockHazard;
+			break;
+		}
+
 		default:
 		{
 			hazard = NULL;
diff --git a/source/hazard/hazard.h b/source/hazard/hazard.h
index fb3a41e80..f874f1f1b 100644
--- a/source/hazard/hazard.h
+++ b/source/hazard/hazard.h
@@ -61,6 +61,7 @@ public:
 		NPC_ROCKSHARD_HAZARD,
 		NPC_INERT_HAZARD,
 		NPC_CONVEYOR_SWITCH_HAZARD,
+		NPC_BOUNCING_ROCK_HAZARD,
 
 		NPC_HAZARD_TYPE_MAX,
 	};
diff --git a/source/triggers/trigger.cpp b/source/triggers/trigger.cpp
index ba86908da..80bd9855c 100644
--- a/source/triggers/trigger.cpp
+++ b/source/triggers/trigger.cpp
@@ -71,6 +71,10 @@
 #include "triggers\thazard.h"
 #endif
 
+#ifndef __TRIGGERS_THAZWALK_H__
+#include "triggers\thazwalk.h"
+#endif
+
 #ifndef __TRIGGERS_TBGEYSER_H__
 #include "triggers\tbgeyser.h"
 #endif
@@ -166,6 +170,10 @@ CTrigger	*trigger;
 			trigger = (CHazardTrigger*)new("HazardTrigger") CHazardTrigger();
 			break;
 
+		case TRIGGER_HAZARD_WALK:
+			trigger = (CHazardWalkTrigger*)new("HazardWalkTrigger") CHazardWalkTrigger();
+			break;
+
 		default:
 			trigger=NULL;
 	}
diff --git a/source/triggers/trigger.h b/source/triggers/trigger.h
index 9414aaedd..51a1f8ecd 100644
--- a/source/triggers/trigger.h
+++ b/source/triggers/trigger.h
@@ -43,6 +43,7 @@ enum TRIGGER_TYPE
 // Code based triggers
 	TRIGGER_PLATFORM,
 	TRIGGER_HAZARD,
+	TRIGGER_HAZARD_WALK,
 	TRIGGER_MAX,
 	};
 
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index 8a0b09e58..ca0a0b434 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -168,7 +168,7 @@ BarrelHazard=3
 DualPlatformBarrelHazard=11
 BouncingBarrel=12
 Fireball=13
-BouncingRock=12
+BouncingRock=22
 FlyTrap=15
 RisingWeight=16
 RisingWeightWheel=17
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 4c668c774..6328470c1 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -841,6 +841,14 @@ SOURCE=..\..\..\source\hazard\hboat.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\hazard\hbrock.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hbrock.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\hazard\hbwheel.cpp
 # End Source File
 # Begin Source File
@@ -1989,6 +1997,14 @@ SOURCE=..\..\..\source\triggers\thazard.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\triggers\thazwalk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\triggers\thazwalk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\triggers\tifemit.cpp
 # End Source File
 # Begin Source File