[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.14.2.1,1.14.2.2 logic.cpp,1.127.2.2,1.127.2.3

Robert G?ffringmann lavosspawn at users.sourceforge.net
Wed Aug 6 03:28:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv22210/sky

Modified Files:
      Tag: branch-0-5-0
	autoroute.cpp logic.cpp 
Log Message:
small autoroute change.

Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- autoroute.cpp	4 Aug 2003 21:18:02 -0000	1.14.2.1
+++ autoroute.cpp	6 Aug 2003 10:27:17 -0000	1.14.2.2
@@ -236,7 +236,7 @@
 	clipCoordX(cpt->extCompact->arTargetX, destX, initDestX);
 	clipCoordY(cpt->extCompact->arTargetY, destY, initDestY);
 
-	((uint16*)cpt->extCompact->animScratch)[0] = 0;
+	memset(cpt->extCompact->animScratch, 0, 32);
 	if ((startX == destX) && (startY == destY))
 		return 2;
 

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.127.2.2
retrieving revision 1.127.2.3
diff -u -d -r1.127.2.2 -r1.127.2.3
--- logic.cpp	4 Aug 2003 21:18:02 -0000	1.127.2.2
+++ logic.cpp	6 Aug 2003 10:27:17 -0000	1.127.2.3
@@ -146,7 +146,7 @@
 void SkyLogic::autoRoute() {
 
 	_compact->downFlag = _skyAutoRoute->autoRoute(_compact);
-	if (!_compact->downFlag) { // route ok
+	if (_compact->downFlag != 1) { // 0 = route ok, 2 = empty route
 		_compact->grafixProg.pos = 0;
 		_compact->grafixProg.ptrTarget = 0;
 		_compact->grafixProg.ptrType = AUTOROUTE;





More information about the Scummvm-git-logs mailing list