From 4ea25dcd9390e6354707619ba455f1ca2b1131a1 Mon Sep 17 00:00:00 2001
From: relnev <relnev@5198baeb-e213-0410-be47-fc2ff85ca46f>
Date: Fri, 11 Apr 2003 03:32:50 +0000
Subject: Moved the copy from position to oldposition to a better spot.  It
 helps to backup position before updating it.  Also uncommented the distance
 check now that it works.

Thanks to Toby Haynes for finding where the pathfinding broke down.


git-svn-id: svn://svn.icculus.org/blackshades/trunk@99 5198baeb-e213-0410-be47-fc2ff85ca46f
---
 Source/GameTick.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'Source/GameTick.cpp')

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 4bce571..ce597df 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -870,7 +870,10 @@ void 	Game::Tick(){
 		//Check people collisions
 
 		for(int k=0;k<numpeople;k++){
-
+			// SBF - backing up the old coordinates makes
+			// the most sense here.
+			person[k].oldplayercoords=person[k].playercoords;
+			
 			person[k].DoStuff(k);
 
 			if(person[k].skeleton.free<1){
@@ -1063,7 +1066,8 @@ void 	Game::Tick(){
 
 			}
 
-			person[k].oldplayercoords=person[k].playercoords;
+			// SBF - this is definately in the wrong spot!
+			//person[k].oldplayercoords=person[k].playercoords;
 
 			}
 
@@ -1733,10 +1737,10 @@ void 	Game::Tick(){
 					// Realcheck tells us
 					// a) we've got close to the end of our path or
 					// b) we're moving away from our target
-					// For whatever reason, part b) appears to be stuffed. Comment it out.
-			 		realcheck=(abs(person[i].playercoords.x-person[i].pathtarget.x)<1&&abs(person[i].playercoords.z-person[i].pathtarget.z)<1);
-					// ||findDistancefast(person[i].playercoords,person[i].pathtarget)>findDistancefast(person[i].oldplayercoords,person[i].pathtarget)
-			 		if(person[i].targetanimation==idleanim&&person[i].killtargetvisible==0){
+			 		realcheck=(abs(person[i].playercoords.x-person[i].pathtarget.x)<1&&abs(person[i].playercoords.z-person[i].pathtarget.z)<1)
+					  ||findDistancefast(person[i].playercoords,person[i].pathtarget)>findDistancefast(person[i].oldplayercoords,person[i].pathtarget);
+			 		
+					if(person[i].targetanimation==idleanim&&person[i].killtargetvisible==0){
 
 						person[i].targetanimation=walkanim;
 
-- 
cgit v1.2.3