[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.31,1.32

[Max Horn]

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

Modified Files:
	boxes.cpp 
Log Message:
proper fix for getPathToDestBox

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- boxes.cpp	19 May 2003 20:36:39 -0000	1.31
+++ boxes.cpp	20 May 2003 12:54:04 -0000	1.32
@@ -571,7 +571,13 @@
 	if (from == to)
 		return to;
 
-	assert(from < numOfBoxes || from == Actor::INVALID_BOX);
+	if (to == Actor::INVALID_BOX)
+		return -1;
+
+	if (from == Actor::INVALID_BOX)
+		return to;
+	
+	assert(from < numOfBoxes);
 	assert(to < numOfBoxes);
 
 	boxm = getBoxMatrixBaseAddr();