From 4e9fb55b363748ef12405ea3ddf29e7a7db7d058 Mon Sep 17 00:00:00 2001
From: Daveo <daveo@localhost>
Date: Fri, 11 May 2001 00:54:52 +0000
Subject: [PATCH]

---
 source/fx/fxjfish.h    | 2 ++
 source/thing/thing.cpp | 6 +++---
 source/thing/thing.h   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/fx/fxjfish.h b/source/fx/fxjfish.h
index e2e8870ad..f87153849 100644
--- a/source/fx/fxjfish.h
+++ b/source/fx/fxjfish.h
@@ -22,6 +22,8 @@ virtual void		think(int _frames);
 virtual void		render();
 
 		void		SetUp(int _Width,int _Gap,int _Length,int _Count);
+virtual	CRECT const	&getCollisionArea()						{return (Parent->getCollisionArea());}
+
 protected:
 
 		int			XOfs;
diff --git a/source/thing/thing.cpp b/source/thing/thing.cpp
index bf993a45c..6e8deb0b7 100644
--- a/source/thing/thing.cpp
+++ b/source/thing/thing.cpp
@@ -211,14 +211,14 @@ DVECTOR	const	&CamPos=CLevel::getCameraPos();
 			if (Flag)
 			{
 				thing->think(_frames);
-				thing->updateCollisionArea();
+//				thing->updateCollisionArea();
 				if (thing->canCollide())
 				{
 					CThingManager::addToCollisionList(thing);
 				}
 			}
 /* THIS WILL NOT STAY HERE, THINGS MUST BE INITIALISED CORRECTLY */
-//			thing->updateCollisionArea();
+			thing->updateCollisionArea();
 
 			thing=thing->m_nextListThing;
 		}
@@ -379,7 +379,7 @@ DVECTOR	const	&CamPos=CLevel::getCameraPos();
 // Shut emm down, sh sh shut em down, we shutem down
 	for(i=0;i<CThing::MAX_TYPE;i++)
 	{
-		thing=s_CollisionLists[i];
+		thing=s_thingLists[i];
 		CThing	*nextThing = thing;
 		while(thing)
 		{
diff --git a/source/thing/thing.h b/source/thing/thing.h
index d97cfe3b7..b7d440bd5 100644
--- a/source/thing/thing.h
+++ b/source/thing/thing.h
@@ -151,7 +151,7 @@ public:
 		DVECTOR	const	&getCollisionCentre()						{return m_collisionCentre;}
 		DVECTOR const	&getCollisionCentreOffset()					{return m_collisionCentreOffset;}
 		int				getCollisionRadius()						{return m_collisionRadius;}
-		CRECT const		&getCollisionArea()							{return m_collisionArea;}
+virtual	CRECT const		&getCollisionArea()							{return m_collisionArea;}
 		s16				getCollisionAngle()							{return m_collisionAngle;}		// pkg - move to CNpcPlatform?
 		DVECTOR const	&getNewCollidedPos()							{return m_newCollidedPos;}		// pkg - to be removed?
 		DVECTOR const	&getCollisionSize()							{return m_collisionSize;}