[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.14,1.15

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv17761

Modified Files:
	actor.cpp 
Log Message:
Patch 622632: FT fuel-tower scale hack improvement


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- actor.cpp	3 Oct 2002 07:38:02 -0000	1.14
+++ actor.cpp	13 Oct 2002 15:51:06 -0000	1.15
@@ -373,12 +373,23 @@
 		scale = resptr[theY];
 	}
 
+	// FIXME - Quick fix to ft's fuel tower bug (by yazoo)
+	//
+	// Ben's Y position can be anything between 272 and 398 inclusive
+	// (which by the way means that we're always looking at the same
+	// element in the scale table... hmmm...)
+	//
+	// When standing at the bottom of the ladder, Ben's Y position is
+	// 356, and by the looks of it he ought to be unscaled there.
+
+	if (scale == 1 && _vm->_currentRoom == 76) {
+		scale = 0xff;
+		if (y < 356)
+			scale -= 2 * (356 - y);
+	}
+
 	if (scale > 255)
 		warning("Actor %d at %d, scale %d out of range", number, y, scale);
-
-	// FIXME - Quick fix to ft's fuel tower bug (by yazoo)
-	if (scale == 1 && _vm->_currentRoom == 76)
-		scale = 0xFF;
 
 	scalex = (byte)scale;
 	scaley = (byte)scale;