From 6fd3ce3f258fd696f27b39c4eb0f4a646549853d Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Fri, 4 May 2001 21:25:33 +0000
Subject: [PATCH]

---
 makefile.gaz                                  |  6 ++-
 source/hazard/hazard.cpp                      | 45 +++++++++++++++++++
 source/hazard/hazard.h                        |  4 ++
 tools/Data/bin/MkLevel.ini                    |  4 ++
 tools/MapEdit/Hazard.ini                      | 40 +++++++++++++++++
 .../spongebob project/spongebob project.dsp   | 32 +++++++++++++
 6 files changed, 130 insertions(+), 1 deletion(-)

diff --git a/makefile.gaz b/makefile.gaz
index 7789323ad..39edc3621 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -119,7 +119,11 @@ hazard_src :=		hazard \
 					hsaw \
 					hbarrel \
 					hboat \
-					hcsaw
+					hcsaw \
+					hmower \
+					hmasher \
+					hfan \
+					hspikes
 
 fx_src :=			fx \
 
diff --git a/source/hazard/hazard.cpp b/source/hazard/hazard.cpp
index a6d96e908..1fc597e89 100644
--- a/source/hazard/hazard.cpp
+++ b/source/hazard/hazard.cpp
@@ -55,6 +55,23 @@
 #include "hazard\hcsaw.h"
 #endif
 
+#ifndef __HAZARD_HMOWER_H__
+#include "hazard\hmower.h"
+#endif
+
+#ifndef __HAZARD_HMASHER_H__
+#include "hazard\hmasher.h"
+#endif
+
+#ifndef __HAZARD_HFAN_H__
+#include "hazard\hfan.h"
+#endif
+
+#ifndef __HAZARD_HSPIKES_H__
+#include "hazard\hspikes.h"
+#endif
+
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE_MAX] =
@@ -65,6 +82,10 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
 	NPC_BARREL_HAZARD,
 	NPC_STATIC_HAZARD,
 	NPC_CIRCULAR_SAW_HAZARD,
+	NPC_MOWER_HAZARD,
+	NPC_MASHER_HAZARD,
+	NPC_FAN_HAZARD,
+	NPC_SPIKES_HAZARD,
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -113,6 +134,30 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
 			break;
 		}
 
+		case NPC_MOWER_HAZARD:
+		{
+			hazard = new ("mower hazard") CNpcMowerHazard;
+			break;
+		}
+
+		case NPC_MASHER_HAZARD:
+		{
+			hazard = new ("masher hazard") CNpcMasherHazard;
+			break;
+		}
+
+		case NPC_FAN_HAZARD:
+		{
+			hazard = new ("fan hazard") CNpcFanHazard;
+			break;
+		}
+
+		case NPC_SPIKES_HAZARD:
+		{
+			hazard = new ("spikes hazard") CNpcSpikesHazard;
+			break;
+		}
+
 		default:
 		{
 			hazard = NULL;
diff --git a/source/hazard/hazard.h b/source/hazard/hazard.h
index 9e5ebb689..d5ec856b7 100644
--- a/source/hazard/hazard.h
+++ b/source/hazard/hazard.h
@@ -42,6 +42,10 @@ public:
 		NPC_BARREL_HAZARD,
 		NPC_STATIC_HAZARD,
 		NPC_CIRCULAR_SAW_HAZARD,
+		NPC_MOWER_HAZARD,
+		NPC_MASHER_HAZARD,
+		NPC_FAN_HAZARD,
+		NPC_SPIKES_HAZARD,
 
 		NPC_HAZARD_TYPE_MAX,
 	};
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index 27a9176cb..66a9b8fd1 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -129,5 +129,9 @@ PumpkinPendulum=1
 RollingRock=3
 CircularSaw=5
 Pylons=4
+SpinningBlades=6
+Masher=7
+Fan=8
+Spikes=9
 
 
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index 6c651a2eb..802118aa7 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -89,3 +89,43 @@ Collision=0
 Health=0
 AttackStrength=0
 Respawn=2
+
+[SpinningBlades]
+Gfx=..\..\graphics\hazards\SPINNINGBLADES\spinningblades.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=2
+
+[Masher]
+Gfx=..\..\graphics\hazards\Masher\masher.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=2
+
+[Fan]
+Gfx=..\..\graphics\hazards\fan\fan.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=2
+
+[Spikes]
+Gfx=..\..\graphics\hazards\spikes\spikes.gin
+WayPoints=1
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=2
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 7c50c237d..6c6d26410 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -809,6 +809,14 @@ SOURCE=..\..\..\source\hazard\hfalling.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\hazard\hfan.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hfan.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\hazard\hfirebal.cpp
 # End Source File
 # Begin Source File
@@ -817,6 +825,22 @@ SOURCE=..\..\..\source\hazard\hfirebal.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\hazard\hmasher.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hmasher.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hmower.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hmower.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\hazard\hpendulm.cpp
 # End Source File
 # Begin Source File
@@ -833,6 +857,14 @@ SOURCE=..\..\..\source\hazard\hsaw.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\hazard\hspikes.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hspikes.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\hazard\hstatic.h
 # End Source File
 # End Group