From 86ff5ed29913d02dc6728febd000371aca4af5de Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Tue, 27 Feb 2001 17:39:25 +0000
Subject: [PATCH]

---
 source/thing/thing.cpp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/source/thing/thing.cpp b/source/thing/thing.cpp
index 1ea80580f..28ceb7d83 100644
--- a/source/thing/thing.cpp
+++ b/source/thing/thing.cpp
@@ -121,6 +121,33 @@ void		CThingManager::thinkAllThings(int _frames)
 		}
 		thing1=thing1->m_nextThing;
 	}
+
+	// Player -> Enemy collision
+	thing1=s_thingLists[CThing::TYPE_ENEMY];
+	thing2=s_thingLists[CThing::TYPE_PLAYER];
+	while(thing1&&thing2)
+	{
+		if(thing1->canCollide()&&
+		   thing1->checkCollisionAgainst(thing2))
+		{
+			thing1->collidedWith(thing2);
+		}
+		thing1=thing1->m_nextThing;
+	}
+
+	// Player -> Enemy projectile collision
+	thing1=s_thingLists[CThing::TYPE_ENEMYPROJECTILE];
+	thing2=s_thingLists[CThing::TYPE_PLAYER];
+	while(thing1&&thing2)
+	{
+		if(thing1->canCollide()&&
+		   thing1->checkCollisionAgainst(thing2))
+		{
+			thing1->collidedWith(thing2);
+		}
+		thing1=thing1->m_nextThing;
+	}
+
 }
 
 /*----------------------------------------------------------------------