[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.12,1.13 string.cpp,1.37,1.38

James Brown ender at users.sourceforge.net
Sun Nov 3 07:57:03 CET 2002


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

Modified Files:
	script_v1.cpp string.cpp 
Log Message:
Fix text positioning for the grail diary in Indy3


Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- script_v1.cpp	3 Nov 2002 07:09:05 -0000	1.12
+++ script_v1.cpp	3 Nov 2002 15:56:52 -0000	1.13
@@ -1894,7 +1894,6 @@
 	}
 
 	_opcode = fetchScriptByte();
-
 	switch (_opcode & 0x1F) {
 	case 1:											/* room scroll */
 		if (!(_features & GF_OLD256)) {
@@ -2240,7 +2239,7 @@
 	int i;
 
 	if (_features & GF_SMALL_HEADER)	// Is dummy function in
-		return;											// SCUMM V3
+		return;				// SCUMM V3
 
 	for (i = 0; i < 15; i++)
 		items[i] = 0;
@@ -2693,7 +2692,8 @@
 		textSlot = 0;
 	}
 
-	setStringVars(textSlot);
+	if (_gameId != GID_INDY3_256)	 // Indy3 seems to need to keep the string positions.
+		setStringVars(textSlot); // See, for example, the text positioning in the grail diary
 
 	while ((_opcode = fetchScriptByte()) != 0xFF) {
 		switch (_opcode & 0xF) {

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- string.cpp	27 Oct 2002 12:26:41 -0000	1.37
+++ string.cpp	3 Nov 2002 15:56:52 -0000	1.38
@@ -692,6 +692,9 @@
 		charset._ypos2 = charset._top;
 	} 
 
+
+	_string[a].xpos = charset._strRight + 8;	// Indy3: Fixes Grail Diary text positioning
+
 	if (_features & GF_AFTER_V7) {
 		charset._hasMask = true;
 		if (charset._strLeft < gdi._mask_left)





More information about the Scummvm-git-logs mailing list