makefile.gaz

@@ -150,7 +150,8 @@ hazard_src :=		hazard \
 					hrweight \
 					hrwheel \
 					hpswitch \
-					hrckshrd
+					hrckshrd \
+					hinert
 
 fx_src :=			fx \
 					fxbaseanim \

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;

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,
 	};

tools/Data/bin/MkLevel.ini

@@ -164,3 +164,5 @@ RisingWeight=16
 RisingWeightWheel=17
 PressureSwitch=18
 SingleSpike=19
+CheckPoint=20
+WaterBucket=20

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

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