From cbb222889a49bdb6d05f05e8e20f16df009a9898 Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Thu, 31 May 2001 15:43:13 +0000
Subject: [PATCH]

---
 makefile.gaz                                  |  3 ++-
 source/hazard/hazard.cpp                      | 11 ++++++++++
 source/hazard/hazard.h                        |  1 +
 tools/Data/bin/MkLevel.ini                    |  4 +++-
 tools/MapEdit/Hazard.ini                      | 20 +++++++++++++++++++
 .../spongebob project/spongebob project.dsp   |  8 ++++++++
 6 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/makefile.gaz b/makefile.gaz
index a4002cf9a..ef9ce3e38 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -150,7 +150,8 @@ hazard_src :=		hazard \
 					hrweight \
 					hrwheel \
 					hpswitch \
-					hrckshrd
+					hrckshrd \
+					hinert
 
 fx_src :=			fx \
 					fxbaseanim \
diff --git a/source/hazard/hazard.cpp b/source/hazard/hazard.cpp
index dc722e938..370cde12e 100644
--- a/source/hazard/hazard.cpp
+++ b/source/hazard/hazard.cpp
@@ -111,6 +111,10 @@
 #include "hazard\hrckshrd.h"
 #endif
 
+#ifndef __HAZARD_HINERT_H__
+#include "hazard\hinert.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -136,6 +140,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
 	NPC_RISING_WEIGHT_WHEEL_HAZARD,
 	NPC_PRESSURE_SWITCH_HAZARD,
 	NPC_ROCKSHARD_HAZARD,
+	NPC_INERT_HAZARD,
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -268,6 +273,12 @@ CNpcHazard *hazard;
 			break;
 		}
 
+		case NPC_INERT_HAZARD:
+		{
+			hazard = new ("inert hazard") CNpcInertHazard;
+			break;
+		}
+
 		default:
 		{
 			hazard = NULL;
diff --git a/source/hazard/hazard.h b/source/hazard/hazard.h
index 168604aab..9422f6fb1 100644
--- a/source/hazard/hazard.h
+++ b/source/hazard/hazard.h
@@ -56,6 +56,7 @@ public:
 		NPC_RISING_WEIGHT_WHEEL_HAZARD,
 		NPC_PRESSURE_SWITCH_HAZARD,
 		NPC_ROCKSHARD_HAZARD,
+		NPC_INERT_HAZARD,
 
 		NPC_HAZARD_TYPE_MAX,
 	};
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index 362160e44..11ff00e25 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -163,4 +163,6 @@ FlyTrap=15
 RisingWeight=16
 RisingWeightWheel=17
 PressureSwitch=18
-SingleSpike=19
\ No newline at end of file
+SingleSpike=19
+CheckPoint=20
+WaterBucket=20
\ No newline at end of file
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index 81417048b..0a8cece81 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -239,3 +239,23 @@ Collision=0
 Health=0
 AttackStrength=0
 Respawn=1
+
+[CheckPoint]
+Gfx=..\..\graphics\hazards\checkpoint\checkpoint.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=1
+
+[WaterBucket]
+Gfx=..\..\graphics\hazards\water_bucket\water_bucket.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=1
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 5fc89755a..d277e58be 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -897,6 +897,14 @@ SOURCE=..\..\..\source\hazard\hflytrap.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\hazard\hinert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hinert.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\hazard\hmasher.cpp
 # End Source File
 # Begin Source File