source/hazard/hazard.cpp

@@ -43,6 +43,18 @@
 #include "hazard\hboat.h"
 #endif
 
+#ifndef __HAZARD_HBARREL_H__
+#include "hazard\hbarrel.h"
+#endif
+
+#ifndef __HAZARD_HSTATIC_H__
+#include "hazard\hstatic.h"
+#endif
+
+#ifndef __HAZARD_HCSAW_H__
+#include "hazard\hcsaw.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE_MAX] =
@@ -50,6 +62,9 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
 	NPC_FALLING_HAZARD,
 	NPC_PENDULUM_HAZARD,
 	NPC_BOAT_HAZARD,
+	NPC_BARREL_HAZARD,
+	NPC_STATIC_HAZARD,
+	NPC_CIRCULAR_SAW_HAZARD,
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -80,6 +95,24 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
 			break;
 		}
 
+		case NPC_BARREL_HAZARD:
+		{
+			hazard = new ("barrel hazard") CNpcBarrelHazard;
+			break;
+		}
+
+		case NPC_STATIC_HAZARD:
+		{
+			hazard = new ("static hazard") CNpcStaticHazard;
+			break;
+		}
+
+		case NPC_CIRCULAR_SAW_HAZARD:
+		{
+			hazard = new ("circular saw hazard") CNpcCircularSawHazard;
+			break;
+		}
+
 		default:
 		{
 			hazard = NULL;

source/hazard/hazard.h

@@ -39,6 +39,9 @@ public:
 		NPC_FALLING_HAZARD = 0,
 		NPC_PENDULUM_HAZARD = 1,
 		NPC_BOAT_HAZARD,
+		NPC_BARREL_HAZARD,
+		NPC_STATIC_HAZARD,
+		NPC_CIRCULAR_SAW_HAZARD,
 
 		NPC_HAZARD_TYPE_MAX,
 	};
@@ -47,7 +50,7 @@ public:
 	void				setGraphic( sThingHazard *ThisHazard );
 	void				shutdown();
 	void				think(int _frames);
-	void				render();
+	virtual void		render();
 	void				setLayerCollision( class CLayerCollision *_layer )		{m_layerCollision=_layer;}
 	virtual void		setWaypoints( sThingHazard *ThisHazard );
 	void				addWaypoint( s32 xPos, s32 yPos );

source/hazard/hbarrel.cpp

@@ -25,22 +25,6 @@ void CNpcBarrelHazard::init()
 {
 	CNpcHazard::init();
 
-	DVECTOR newPos;
-
-	Pos.vx = 100;
-	Pos.vy = 100;
-	m_base = Pos;
-
-	newPos.vx = 600;
-	newPos.vy = 100;
-
-	m_npcPath.addWaypoint( newPos );
-
-	newPos.vx = 50;
-	newPos.vy = 100;
-
-	m_npcPath.addWaypoint( newPos );
-
 	m_npcPath.setPathType( CNpcPath::SINGLE_USE_PATH );
 }