[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.172,1.173 actor.h,1.39,1.40 boxes.cpp,1.62,1.63

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19584

Modified Files:
	actor.cpp actor.h boxes.cpp 
Log Message:
yet another tiny cleanup.... yeah yeah, I know I am annoying

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- actor.cpp	11 Sep 2003 22:26:44 -0000	1.172
+++ actor.cpp	11 Sep 2003 22:36:21 -0000	1.173
@@ -1383,7 +1383,7 @@
 
 		walkdata.curbox = next_box;
 		
-		if (findPathTowards(walkbox, next_box, walkdata.destbox, foundPath.x, foundPath.y))
+		if (findPathTowards(walkbox, next_box, walkdata.destbox, foundPath))
 			break;
 
 		if (calcMovementFactor(foundPath))

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- actor.h	11 Sep 2003 22:26:44 -0000	1.39
+++ actor.h	11 Sep 2003 22:36:21 -0000	1.40
@@ -203,7 +203,7 @@
 	
 	bool isPlayer();
 
-	bool findPathTowards(byte box, byte box2, byte box3, int16 &foundPathX, int16 &foundPathY);
+	bool findPathTowards(byte box, byte box2, byte box3, ScummVM::Point &foundPath);
 	void findPathTowardsOld(byte box, byte box2, byte box3, ScummVM::Point &p2, ScummVM::Point &p3);
 };
 

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- boxes.cpp	11 Sep 2003 22:26:44 -0000	1.62
+++ boxes.cpp	11 Sep 2003 22:36:21 -0000	1.63
@@ -769,7 +769,7 @@
  * Computes the next point actor a has to walk towards in a straight
  * line in order to get from box1 to box3 via box2.
  */
-bool Actor::findPathTowards(byte box1nr, byte box2nr, byte box3nr, int16 &foundPathX, int16 &foundPathY) {
+bool Actor::findPathTowards(byte box1nr, byte box2nr, byte box3nr, ScummVM::Point &foundPath) {
 	BoxCoords box1;
 	BoxCoords box2;
 	ScummVM::Point tmp;
@@ -831,8 +831,8 @@
 						q = box1.ur.y;
 					if (q == pos && box2nr == box3nr)
 						return true;
-					foundPathY = q;
-					foundPathX = box1.ul.x;
+					foundPath.y = q;
+					foundPath.x = box1.ul.x;
 					return false;
 				}
 			}
@@ -882,8 +882,8 @@
 						q = box1.ur.x;
 					if (q == pos && box2nr == box3nr)
 						return true;
-					foundPathX = q;
-					foundPathY = box1.ul.y;
+					foundPath.x = q;
+					foundPath.y = box1.ul.y;
 					return false;
 				}
 			}