From b60cf260f5de17481f8a5d7ddf81eec2c093e5c5 Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Thu, 26 Jul 2001 19:18:11 +0000
Subject: [PATCH]

---
 source/enemy/ngeneric.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/source/enemy/ngeneric.cpp b/source/enemy/ngeneric.cpp
index b86b73f49..daa9039f0 100644
--- a/source/enemy/ngeneric.cpp
+++ b/source/enemy/ngeneric.cpp
@@ -375,6 +375,24 @@ void CNpcEnemy::processGenericFixedPathWalk( int _frames, s32 *moveX, s32 *moveY
 			}
 		}
 	}
+
+	switch ( CGameScene::getCollision()->getCollisionBlock( Pos.vx + (*moveX), Pos.vy + (*moveY) + 1 ) & COLLISION_TYPE_MASK )
+	{
+		case COLLISION_TYPE_FLAG_DEATH_FALL:
+		case COLLISION_TYPE_FLAG_DEATH_INSTANT:
+		case COLLISION_TYPE_FLAG_DEATH_LIQUID:
+		case COLLISION_TYPE_FLAG_DAMAGE:
+		{
+			m_health = 0;
+			m_controlFunc = NPC_CONTROL_SHOT;
+			m_state = NPC_GENERIC_HIT_CHECK_HEALTH;
+
+			break;
+		}
+
+		default:
+			break;
+	}
 }
 
 bool CNpcEnemy::isCollisionWithGround()