From f51c4dba8838203c84645ef6c3ffd83135b144ca Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Fri, 10 Aug 2001 18:55:44 +0000
Subject: [PATCH]

---
 source/friend/fgary.cpp      | 2 ++
 source/friend/friend.cpp     | 4 ++--
 source/platform/platform.cpp | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/friend/fgary.cpp b/source/friend/fgary.cpp
index 7ebd5bf00..1f34346da 100644
--- a/source/friend/fgary.cpp
+++ b/source/friend/fgary.cpp
@@ -369,6 +369,8 @@ void CNpcGaryFriend::think( int _frames )
 	s16 heading = ratan2( yDist, xDist );
 
 	m_drawRotation = heading;
+
+	CNpcThing::think(_frames);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/friend/friend.cpp b/source/friend/friend.cpp
index 9defa909c..fae93d8f9 100644
--- a/source/friend/friend.cpp
+++ b/source/friend/friend.cpp
@@ -236,8 +236,6 @@ void CNpcFriend::shutdown()
 
 void CNpcFriend::think(int _frames)
 {
-	CNpcThing::think(_frames);
-
 	if ( m_animPlaying )
 	{
 		s32 frameCount;
@@ -264,6 +262,8 @@ void CNpcFriend::think(int _frames)
 	}
 
 	m_iconStrobe=(m_iconStrobe+(strobespeed))&4095;
+
+	CNpcThing::think(_frames);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/platform/platform.cpp b/source/platform/platform.cpp
index 766eb79d6..6273d86ac 100644
--- a/source/platform/platform.cpp
+++ b/source/platform/platform.cpp
@@ -1258,12 +1258,12 @@ int CNpcPlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
 				thatRect = _thisThing->getCollisionArea();
 
 				DVECTOR const &thisPosDelta = getPosDelta();
-				int	ThisAbsY=abs(thisPosDelta.vy)>>1;
+				int	ThisAbsY=abs(thisPosDelta.vy);
 				thisRect.y1 -= ThisAbsY;
 				thisRect.y2 += ThisAbsY;
 
 				DVECTOR const &ThatPosDelta = _thisThing->getPosDelta();
-				int	ThatAbsY=abs(ThatPosDelta.vy)>>1;
+				int	ThatAbsY=abs(ThatPosDelta.vy);
 				thatRect.y1 -= ThatAbsY;
 				thatRect.y2 += ThatAbsY;