source/hazard/hazard.cpp

@@ -542,6 +542,9 @@ void CNpcHazard::collidedWith( CThing *_thisThing )
 				break;
 			}
 
+			case TYPE_NPC:
+				break;
+
 			default:
 				ASSERT(0);
 				break;

source/hazard/hrweight.cpp

@@ -27,6 +27,10 @@
 #include	"game\game.h"
 #endif
 
+#ifndef __FRIEND_FRIEND_H__
+#include "friend\friend.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -216,3 +220,39 @@ void CNpcRisingWeightHazard::render()
 		}
 	}
 }
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void CNpcRisingWeightHazard::collidedWith( CThing *_thisThing )
+{
+	if ( m_isActive )
+	{
+		switch(_thisThing->getThingType())
+		{
+			case TYPE_PLAYER:
+			{
+				CPlayer *player = (CPlayer *) _thisThing;
+
+				if ( !player->isRecoveringFromHit() )
+				{
+					player->takeDamage( DAMAGE__HIT_ENEMY );
+				}
+
+				break;
+			}
+
+			case TYPE_NPC:
+			{
+				CNpcFriend *npcFriend = (CNpcFriend *) _thisThing;
+
+				npcFriend->setObstructed();
+
+				break;
+			}
+
+			default:
+				ASSERT(0);
+				break;
+		}
+	}
+}

source/hazard/hrweight.h

@@ -27,6 +27,7 @@ public:
 	void				setTriggered()											{m_triggered = true;}
 	CRECT const			*getThinkBBox()											{return( CThing::getThinkBBox() );}
 protected:
+	virtual void		collidedWith(CThing *_thisThing);
 	void				setWaypoints( sThingHazard *ThisHazard );
 	void				processMovement( int _frames );