source/enemy/nssnake.cpp

@@ -1018,21 +1018,6 @@ void CNpcSeaSnakeEnemy::processShot( int _frames )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*const CRECT *CNpcSeaSnakeEnemy::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcSeaSnakeEnemy::processUserCollision( CThing *thisThing )
 {
 }

source/enemy/nssnake.h

@@ -59,7 +59,6 @@ public:
 	virtual void		shutdown();
 	virtual void		render();
 	virtual int			checkCollisionAgainst(CThing *_thisThing, int _frames);
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual s32			getFrameShift( int _frames );
 	virtual bool		processSensor();

source/enemy/nsstomp.cpp

@@ -158,21 +158,6 @@ void CNpcSkullStomperEnemy::processClose( int _frames )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*const CRECT *CNpcSkullStomperEnemy::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcSkullStomperEnemy::collidedWith( CThing *_thisThing )
 {
 	if ( m_isActive && !m_isCaught && !m_isDying )

source/enemy/nsstomp.h

@@ -18,7 +18,6 @@ class CNpcSkullStomperEnemy : public CNpcEnemy
 {
 public:
 	virtual void		postInit();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		processEnemyCollision( CThing *thisThing );
 	virtual bool		processSensor();

source/friend/fgary.cpp

@@ -282,21 +282,6 @@ void CNpcGaryFriend::startRight()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const CRECT *CNpcGaryFriend::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcGaryFriend::start()
 {
 	if ( !m_started )

source/friend/fgary.h

@@ -24,7 +24,7 @@ public:
 	virtual void		postInit();
 	virtual void		think( int _frames );
 	virtual void		setupWaypoints( sThingActor *ThisActor );
-	virtual	CRECT const		*getThinkBBox();
+	bool				alwaysThink()											{return(true);}
 	DVECTOR const		&getTriggerPos()										{return( m_triggerPos );}
 	void				start();
 	void				stop();

source/hazard/hbarrel.cpp

@@ -152,18 +152,3 @@ void CNpcBarrelHazard::render()
 		m_modelGfx->Render(renderPos,&rotation,&scale);
 	}
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcBarrelHazard::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/hazard/hbarrel.h

@@ -23,7 +23,6 @@ class CNpcBarrelHazard : public CNpcHazard
 public:
 	void				init();
 	void				render();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	void				processMovement( int _frames );
 

source/hazard/hbbarrel.cpp

@@ -198,21 +198,6 @@ void CNpcBouncingBarrelHazard::render()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*const CRECT *CNpcBouncingBarrelHazard::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcBouncingBarrelHazard::collidedWith( CThing *_thisThing )
 {
 	if ( m_isActive )

source/hazard/hbbarrel.h

@@ -23,7 +23,6 @@ class CNpcBouncingBarrelHazard : public CNpcHazard
 public:
 	void				init();
 	void				render();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	void				processMovement( int _frames );
 	virtual void		collidedWith(CThing *_thisThing);

source/hazard/hbwheel.cpp

@@ -76,18 +76,3 @@ void CNpcBigWheelHazard::collidedWith( CThing *_thisThing )
 {
 	// do not collide
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const CRECT *CNpcBigWheelHazard::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}

source/hazard/hbwheel.h

@@ -23,7 +23,7 @@ class CNpcBigWheelHazard : public CNpcHazard
 public:
 	void				init();
 	virtual void		render();
-	virtual	CRECT const		*getThinkBBox();
+	bool				alwaysThink()								{return(true);}
 protected:
 	void				processMovement( int _frames );
 	virtual void		collidedWith(CThing *_thisThing);

source/hazard/hdbarrel.cpp

@@ -178,18 +178,3 @@ void CNpcDualPlatformBarrelHazard::render()
 		m_modelGfx->Render(renderPos,&rotation,&scale);
 	}
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcDualPlatformBarrelHazard::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/hazard/hdbarrel.h

@@ -23,7 +23,6 @@ class CNpcDualPlatformBarrelHazard : public CNpcHazard
 public:
 	void				init();
 	void				render();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	void				processMovement( int _frames );
 

source/hazard/hfalling.cpp

@@ -225,18 +225,6 @@ void CNpcFallingHazard::collidedWith( CThing *_thisThing )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*const CRECT *CNpcFallingHazard::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.y2 = thinkBBox.YMin + 1;
-
-	return &objThinkBox;
-}*/
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcFallingHazard::setWaypoints( sThingHazard *ThisHazard )
 {
 	int pointNum;

source/hazard/hfalling.h

@@ -22,7 +22,6 @@ class CNpcFallingHazard : public CNpcHazard
 {
 public:
 	void				init();
-	//virtual	CRECT const		*getThinkBBox();
 	virtual void		setWaypoints( sThingHazard *ThisHazard );
 	void				render();
 protected:

source/hazard/hrrock.cpp

@@ -199,18 +199,3 @@ void CNpcRollingRockHazard::render()
 		m_modelGfx->Render(renderPos,&rotation,&scale);
 	}
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcRollingRockHazard::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/hazard/hrrock.h

@@ -23,7 +23,6 @@ class CNpcRollingRockHazard : public CNpcHazard
 public:
 	void				init();
 	void				render();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	void				processMovement( int _frames );
 

source/hazard/hspikes.cpp

@@ -95,21 +95,6 @@ void CNpcSpikesHazard::processMovement( int _frames )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const CRECT *CNpcSpikesHazard::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcSpikesHazard::processTimer( int _frames )
 {
 	if ( m_timer > 0 )

source/hazard/hspikes.h

@@ -22,7 +22,7 @@ class CNpcSpikesHazard : public CNpcHazard
 {
 public:
 	void				init();
-	virtual	CRECT const	*getThinkBBox();
+	bool				alwaysThink()								{return(true);}
 protected:
 	virtual void		processTimer( int _frames );
 	void				processMovement( int _frames );

source/platform/pbgeyser.cpp

@@ -89,18 +89,3 @@ void CNpcGeyserPlatformGenerator::think( int _frames )
 		newPlatform->postInit();
 	}
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcGeyserPlatformGenerator::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/platform/pbgeyser.h

@@ -23,7 +23,6 @@ class CNpcGeyserPlatformGenerator : public CNpcPlatform
 public:
 	void				setTargetType( NPC_PLATFORM_UNIT_TYPE targetType )		{m_targetType = targetType;}
 	virtual void		render();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		think( int _frames );
 	virtual void		collidedWith(CThing *_thisThing);

source/platform/pbubble.cpp

@@ -128,18 +128,3 @@ void CNpcBubblePlatform::processLifetime( int _frames )
 		}
 	}
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcBubblePlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/platform/pbubble.h

@@ -23,7 +23,6 @@ class CNpcBubblePlatform : public CNpcPlatform
 public:
 	virtual void		render();
 	virtual void		postInit();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		processLifetime( int _frames );
 	virtual void		processMovement( int _frames );

source/platform/pbwheel.cpp

@@ -98,21 +98,6 @@ void CNpcBigWheelPlatform::setWaypoints( sThingPlatform *ThisPlatform )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const CRECT *CNpcBigWheelPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 int	CNpcBigWheelPlatform::getHeightFromPlatformAtPosition(int _x,int _y, int offsetX, int offsetY)
 {
 	DVECTOR top;

source/platform/pbwheel.h

@@ -21,7 +21,7 @@
 class CNpcBigWheelPlatform : public CNpcPlatform
 {
 public:
-	virtual	CRECT const	*getThinkBBox();
+	bool				alwaysThink()								{return(true);}
 	virtual void		postInit();
 	virtual int			getHeightFromPlatformAtPosition(int _x,int _y, int offsetX = 0, int offsetY = 0);
 protected:

source/platform/pconveyr.cpp

@@ -87,21 +87,6 @@ void CNpcConveyorPlatformGenerator::think( int _frames )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*const CRECT *CNpcConveyorPlatformGenerator::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcConveyorPlatform::postInit()
 {
 	CNpcPlatform::postInit();
@@ -183,21 +168,6 @@ void CNpcConveyorPlatform::processMovement( int _frames )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*const CRECT *CNpcConveyorPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcConveyorPlatform::collidedWith( CThing *_thisThing )
 {
 	switch(_thisThing->getThingType())

source/platform/pconveyr.h

@@ -22,7 +22,6 @@ class CNpcConveyorPlatform : public CNpcPlatform
 {
 public:
 	virtual void		postInit();
-	//virtual	CRECT const		*getThinkBBox();
 	virtual void		render();
 	virtual int			checkCollisionAgainst(CThing *_thisThing, int _frames);
 protected:
@@ -37,7 +36,6 @@ class CNpcConveyorPlatformGenerator : public CNpcPlatform
 {
 public:
 	virtual void		render();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		think( int _frames );
 	virtual void		collidedWith(CThing *_thisThing);

source/platform/pdrop.cpp

@@ -35,18 +35,3 @@ void CNpcDropPlatform::processMovement( int _frames )
 
 	Pos.vy += moveY;
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcDropPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/platform/pdrop.h

@@ -20,8 +20,6 @@
 
 class CNpcDropPlatform : public CNpcPlatform
 {
-//public:
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		processMovement( int _frames );
 };

source/platform/pdual.cpp

@@ -336,21 +336,6 @@ void CNpcDualPlatform::render()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*const CRECT *CNpcDualPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcDualPlatform::collidedWith( CThing *_thisThing )
 {
 	switch(_thisThing->getThingType())

source/platform/pdual.h

@@ -29,7 +29,6 @@ public:
 	DVECTOR				getLineBase()										{return( m_lineBase );}
 	virtual void		render();
 	void				setThinkArea( CRECT &newArea );
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		setWaypoints( sThingPlatform *ThisPlatform );
 	virtual void		processMovement( int _frames );

source/platform/pfallnor.cpp

@@ -124,21 +124,6 @@ void CNpcFallingNoRespawnPlatform::processMovement( int _frames )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const CRECT *CNpcFallingNoRespawnPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void CNpcFallingNoRespawnPlatform::render()
 {
 	if ( m_isActive )

source/platform/pfallnor.h

@@ -22,7 +22,7 @@ class CNpcFallingNoRespawnPlatform : public CNpcPlatform
 {
 public:
 	virtual void		postInit();
-	virtual	CRECT const		*getThinkBBox();
+	bool				alwaysThink()												{return(true);}
 	virtual int			checkCollisionAgainst(CThing *_thisThing, int _frames);
 protected:
 	virtual void		render();

source/platform/pfgen.cpp

@@ -97,18 +97,3 @@ void CNpcFallingPlatformGenerator::think( int _frames )
 		newPlatform->postInit();
 	}
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const CRECT *CNpcFallingPlatformGenerator::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}

source/platform/pfgen.h

@@ -23,7 +23,7 @@ class CNpcFallingPlatformGenerator : public CNpcPlatform
 public:
 	void				setTargetType( NPC_PLATFORM_UNIT_TYPE targetType )		{m_targetType = targetType;}
 	virtual void		render();
-	virtual	CRECT const		*getThinkBBox();
+	bool				alwaysThink()											{return(true);}
 protected:
 	virtual void		think( int _frames );
 	virtual void		collidedWith(CThing *_thisThing);

source/platform/pjellfsh.cpp

@@ -140,18 +140,3 @@ void CNpcJellyfishPlatform::think( int _frames )
 
 	CNpcLinearPlatform::think( _frames );
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcJellyfishPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/platform/pjellfsh.h

@@ -23,7 +23,6 @@ class CNpcJellyfishPlatform : public CNpcLinearPlatform
 public:
 	virtual void		postInit();
 	virtual void		think( int _frames );
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		collidedWith(CThing *_thisThing);
 

source/platform/plantern.cpp

@@ -118,18 +118,3 @@ void CNpcLanternPlatform::processMovement( int _frames )
 	Pos.vx = m_base.vx + ( ( m_length * rcos( m_heading + m_extension ) ) >> 12 );
 	Pos.vy = m_base.vy + ( ( m_length * rsin( m_heading + m_extension ) ) >> 12 );
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const CRECT *CNpcLanternPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}

source/platform/plantern.h

@@ -22,7 +22,7 @@ class CNpcLanternPlatform : public CNpcPlatform
 {
 public:
 	virtual void		postInit();
-	virtual	CRECT const		*getThinkBBox();
+	bool				alwaysThink()									{return(true);}
 protected:
 	virtual void		setWaypoints( sThingPlatform *ThisPlatform );
 	virtual void		processMovement( int _frames );

source/platform/plinear.cpp

@@ -136,18 +136,3 @@ void CNpcLinearPlatform::processMovement( int _frames )
 	Pos.vx += moveX;
 	Pos.vy += moveY;
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcLinearPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/platform/plinear.h

@@ -22,7 +22,6 @@ class CNpcLinearPlatform : public CNpcPlatform
 {
 public:
 	virtual void		postInit();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		processMovement( int _frames );
 };

source/platform/ppendulm.cpp

@@ -196,15 +196,3 @@ void CNpcPendulumPlatform::render()
 		}
 	}
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcPendulumPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.y1 = thinkBBox.YMax - 1;
-
-	return &objThinkBox;
-}*/

source/platform/ppendulm.h

@@ -23,7 +23,6 @@ class CNpcPendulumPlatform : public CNpcPlatform
 public:
 	virtual void		postInit();
 	virtual void		render();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		setWaypoints( sThingPlatform *ThisPlatform );
 	virtual void		processMovement( int _frames );

source/platform/praft.cpp

@@ -212,18 +212,3 @@ void CNpcRaftPlatform::render()
 		}
 	}
 }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*const CRECT *CNpcRaftPlatform::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}*/

source/platform/praft.h

@@ -23,7 +23,6 @@ class CNpcRaftPlatform : public CNpcPlatform
 public:
 	virtual void		postInit();
 	virtual void		render();
-	//virtual	CRECT const		*getThinkBBox();
 protected:
 	virtual void		processMovement( int _frames );
 

source/triggers/tgbowl.cpp

@@ -68,20 +68,5 @@ void	CGaryBowlTrigger::collidedWith(CThing *_thisThing)
 	}
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const CRECT *CGaryBowlTrigger::getThinkBBox()
-{
-	CRECT objThinkBox = getCollisionArea();
-
-	sBBox &thinkBBox = CThingManager::getThinkBBox();
-	objThinkBox.x1 = thinkBBox.XMin;
-	objThinkBox.x2 = thinkBBox.XMax;
-	objThinkBox.y1 = thinkBBox.YMin;
-	objThinkBox.y2 = thinkBBox.YMax;
-
-	return &objThinkBox;
-}
-
 /*===========================================================================
 end */

source/triggers/tgbowl.h

@@ -37,7 +37,7 @@
 class CGaryBowlTrigger : public CTrigger
 {
 public:
-	virtual	CRECT const		*getThinkBBox();
+	bool				alwaysThink()								{return(true);}
 protected:
 	virtual void		collidedWith(CThing *_thisThing);
 };