From 28f7a7d1864da183c2d7ab5b7b25818ca420780f Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Sat, 5 May 2001 21:04:00 +0000
Subject: [PATCH]

---
 makefile.gaz                                       |  3 ++-
 source/hazard/hazard.cpp                           | 11 +++++++++++
 source/hazard/hazard.h                             |  1 +
 tools/Data/bin/MkLevel.ini                         |  1 +
 tools/MapEdit/Hazard.ini                           | 10 ++++++++++
 users/paul/spongebob project/spongebob project.dsp |  8 ++++++++
 6 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/makefile.gaz b/makefile.gaz
index 740ef3e5e..1cc193d73 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -130,7 +130,8 @@ hazard_src :=		hazard \
 					hfan \
 					hspikes \
 					hbwheel \
-					hdbarrel
+					hdbarrel \
+					hbbarrel
 
 fx_src :=			fx \
 					fxjfish
diff --git a/source/hazard/hazard.cpp b/source/hazard/hazard.cpp
index 68344be61..d6cb84109 100644
--- a/source/hazard/hazard.cpp
+++ b/source/hazard/hazard.cpp
@@ -79,6 +79,10 @@
 #include "hazard\hdbarrel.h"
 #endif
 
+#ifndef __HAZARD_HBBARREL_H__
+#include "hazard\hbbarrel.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -96,6 +100,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
 	NPC_SPIKES_HAZARD,
 	NPC_BIG_WHEEL_HAZARD,
 	NPC_DUAL_PLATFORM_BARREL_HAZARD,
+	NPC_BOUNCING_BARREL_HAZARD,
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -180,6 +185,12 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
 			break;
 		}
 
+		case NPC_BOUNCING_BARREL_HAZARD:
+		{
+			hazard = new ("bouncing barrel hazard") CNpcBouncingBarrelHazard;
+			break;
+		}
+
 		default:
 		{
 			hazard = NULL;
diff --git a/source/hazard/hazard.h b/source/hazard/hazard.h
index eaa2eecc9..aa8552152 100644
--- a/source/hazard/hazard.h
+++ b/source/hazard/hazard.h
@@ -48,6 +48,7 @@ public:
 		NPC_SPIKES_HAZARD,
 		NPC_BIG_WHEEL_HAZARD,
 		NPC_DUAL_PLATFORM_BARREL_HAZARD,
+		NPC_BOUNCING_BARREL_HAZARD,
 
 		NPC_HAZARD_TYPE_MAX,
 	};
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index 3868703ff..a55693053 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -141,5 +141,6 @@ Spikes=9
 Wheel=10
 BarrelHazard=3
 DualPlatformBarrelHazard=11
+BouncingBarrel=12
 
 
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index 527eaa25e..2c94cebf9 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -159,3 +159,13 @@ Collision=0
 Health=0
 AttackStrength=0
 Respawn=2
+
+[BouncingBarrel]
+Gfx=..\..\graphics\platforms\barrel\barrel.gin
+WayPoints=32
+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 2084ccf9b..6e612e30f 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -785,6 +785,14 @@ SOURCE=..\..\..\source\hazard\hbarrel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\hazard\hbbarrel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\hazard\hbbarrel.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\hazard\hboat.cpp
 # End Source File
 # Begin Source File