[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.65,1.66 script_v2.cpp,2.143,2.144

James Brown ender at users.sourceforge.net
Wed Jul 9 07:58:08 CEST 2003


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

Modified Files:
	debugger.cpp script_v2.cpp 
Log Message:
Fix compilation, V1 verb positions


Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- debugger.cpp	9 Jul 2003 13:23:16 -0000	1.65
+++ debugger.cpp	9 Jul 2003 14:57:15 -0000	1.66
@@ -654,7 +654,7 @@
 	} else if (!strcmp(argv[2], "state")) {
 		_s->putState(obj, atoi(argv[3]));
 		//is BgNeedsRedraw enough?
-		_s->_BgNeedsRedraw = TRUE;
+		_s->_BgNeedsRedraw = true;
 	} else {
 		  Debug_Printf("Unknown object command '%s'\nUse <pickup | state> as command\n", argv[2]);
 	}

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.143
retrieving revision 2.144
diff -u -d -r2.143 -r2.144
--- script_v2.cpp	2 Jul 2003 14:21:13 -0000	2.143
+++ script_v2.cpp	9 Jul 2003 14:57:15 -0000	2.144
@@ -816,6 +816,9 @@
 		slot = getVarOrDirectByte(0x80) + 1;
 		/* int unk = */ fetchScriptByte(); // ?
 		
+		if (_version == 1)	// V1 Verbs are positioned relative to the 'verb area' - under the sentence
+			y+=9;
+
 		//printf("o2_verbOps: verb = %d, slot = %d, x = %d, y = %d, unk = %d, name = %s\n",
 		//		verb, slot, x, y, unk, _scriptPointer);
 





More information about the Scummvm-git-logs mailing list