[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.235,1.236

Max Horn fingolfin at users.sourceforge.net
Mon Apr 5 17:10:02 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13597

Modified Files:
	script_v5.cpp 
Log Message:
Replaced FIXME with proper explanation and code (the previous hack was actually correct, just incomplete)

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- script_v5.cpp	5 Apr 2004 23:54:56 -0000	1.235
+++ script_v5.cpp	5 Apr 2004 23:56:28 -0000	1.236
@@ -2701,17 +2701,16 @@
 				break;
 			}
 
-			// FIXME: Store positions, this is needed for Indy3 (Grail Diary)..
-			// I don't believe this is the correct fix, may cause other problems
-			// later in the game.
+ 			// In SCUMM V1-V3, there were no 'default' values for the text slot
+ 			// values. Hence to achieve correct behaviour, we have to keep the
+ 			// 'default' values in sync with the active values. To do that we
+ 			// simply call saveDefault() on the StringTab in question.
  			//
- 			// It's also needed for Loom, or the lines Bobbin
- 			// speaks during the intro are put at position 0,0.
- 			// In addition, Loom needs to remember the text colour.
-			if (_gameId == GID_LOOM || _gameId == GID_INDY3) {
-				_string[textSlot]._default.xpos = _string[textSlot].xpos;
-				_string[textSlot]._default.ypos = _string[textSlot].ypos;
- 				_string[textSlot]._default.color = _string[textSlot].color;
+			// Note: This is needed for Indy3 (Grail Diary). It's also needed
+			// for Loom, or the lines Bobbin speaks during the intro are put
+			// at position 0,0.
+			if (_version <= 3) {
+ 				_string[textSlot].saveDefault();
 			}
 			return;
 		default:





More information about the Scummvm-git-logs mailing list