[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.27,1.28

James Brown ender at users.sourceforge.net
Tue Oct 1 10:04:13 CEST 2002


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

Modified Files:
	gfx.cpp 
Log Message:
Fix some faulty resource-validation logic to allow part of the fuel-tower to work.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gfx.cpp	30 Sep 2002 06:22:11 -0000	1.27
+++ gfx.cpp	1 Oct 2002 16:58:26 -0000	1.28
@@ -2484,6 +2484,19 @@
 	byte *string1, *string2, *string3;
 	int i;
 
+	string1 = getStringAddress(string_id);
+	string2 = getStringAddress(string_id + 1);
+	string3 = getStringAddress(string_id + 2);
+	if (!string1 || !string2 || !string3) {
+		warning("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d\n",
+		        start, end, string_id, time, string_id, string_id + 1, string_id + 2);
+		return;
+	}
+
+	string1+=start;
+	string2+=start;
+	string3+=start;
+
 	_palManipStart = start;
 	_palManipEnd = end;
 	_palManipCounter = 0;
@@ -2496,15 +2509,6 @@
 	pal = _currentPalette + start * 3;
 	target = _palManipPalette + start * 3;
 	between = _palManipIntermediatePal + start * 6;
-
-	string1 = getStringAddress(string_id) + start;
-	string2 = getStringAddress(string_id + 1) + start;
-	string3 = getStringAddress(string_id + 2) + start;
-	if (!string1 || !string2 || !string3) {
-		warning("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d\n",
-		        start, end, string_id, time, string_id, string_id + 1, string_id + 2);
-		return;
-	}
 
 	for (i = start; i < end; ++i) {
 		*target++ = *string1++;





More information about the Scummvm-git-logs mailing list