[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.48,1.49 script_v8.cpp,2.116,2.117 scumm.h,1.133,1.134

James Brown ender at users.sourceforge.net
Wed Jan 15 08:44:46 CET 2003


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

Modified Files:
	saveload.cpp script_v8.cpp scumm.h 
Log Message:
localvar fix take 2. Note that ship-to-ship combat is still impossible (cannons dont work), but at least it doesnt crash now - you 
can use the cheat (shift-v i think)


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- saveload.cpp	15 Jan 2003 15:49:44 -0000	1.48
+++ saveload.cpp	15 Jan 2003 16:23:03 -0000	1.49
@@ -361,7 +361,7 @@
 		// 16 to 32 bit variables... and THEN from 16 to 20 variables
 		MKARRAY_OLD(Scumm, vm.localvar[0][0], sleUint16, 25 * 17, VER_V8, VER_V8),
 		MKARRAY_OLD(Scumm, vm.localvar[0][0], sleUint16, NUM_SCRIPT_SLOT * 17, VER_V9, VER_V14),
-		MKARRAY(Scumm, vm.localvar[0][0], sleUint16, NUM_SCRIPT_SLOT * 20, VER_V15),
+		MKARRAY(Scumm, vm.localvar[0][0], sleUint16, NUM_SCRIPT_SLOT * 25, VER_V15),
 
 		MKARRAY(Scumm, _resourceMapper[0], sleByte, 128, VER_V8),
 		MKARRAY(Scumm, _charsetColorMap[0], sleByte, 16, VER_V8),

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.116
retrieving revision 2.117
diff -u -d -r2.116 -r2.117
--- script_v8.cpp	15 Jan 2003 13:29:00 -0000	2.116
+++ script_v8.cpp	15 Jan 2003 16:23:04 -0000	2.117
@@ -410,7 +410,7 @@
 
 	if (var & 0x40000000) {
 		var &= 0xFFFFFFF;
-		checkRange(0x10, 0, var, "Local variable %d out of range(r)");
+		checkRange(25, 0, var, "Local variable %d out of range(r)");
 		return vm.localvar[_currentScript][var];
 	}
 
@@ -449,7 +449,7 @@
 
 	if (var & 0x40000000) {
 		var &= 0xFFFFFFF;
-		checkRange(0x10, 0, var, "Local variable %d out of range(w)");
+		checkRange(25, 0, var, "Local variable %d out of range(w)");
 		vm.localvar[_currentScript][var] = value;
 		return;
 	}

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- scumm.h	15 Jan 2003 15:49:44 -0000	1.133
+++ scumm.h	15 Jan 2003 16:23:04 -0000	1.134
@@ -254,7 +254,7 @@
 		byte cutSceneStackPointer;
 		ScriptSlot slot[NUM_SCRIPT_SLOT];
 		NestedScript nest[15];
-		int32 localvar[NUM_SCRIPT_SLOT][21];
+		int32 localvar[NUM_SCRIPT_SLOT][26];
 	} vm;
 
 	struct {





More information about the Scummvm-git-logs mailing list