[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.577.2.9,2.577.2.10 vars.cpp,1.71,1.71.2.1

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	scummvm.cpp vars.cpp 
Log Message:

Back port fixes for Macintosh version of Loom.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.9
retrieving revision 2.577.2.10
diff -u -d -r2.577.2.9 -r2.577.2.10
--- scummvm.cpp	2 May 2004 16:36:04 -0000	2.577.2.9
+++ scummvm.cpp	3 May 2004 02:04:57 -0000	2.577.2.10
@@ -620,6 +620,8 @@
 	VAR_VERB_ALLOWED = 0xFF;
 	VAR_CLICK_AREA = 0xFF;
 
+	VAR_VOICE_MODE = 0xFF;
+
 	// Use g_scumm from error() ONLY
 	g_scumm = this;
 
@@ -1206,8 +1208,8 @@
 		VAR(59) = 3;	// FIXME: What is this good for?
 	}
 	
-	if ((_features & GF_MACINTOSH) && (_version == 3)) {
-		// This is the for the Mac version of Indy3/Loom
+	if (!(_features & GF_MACINTOSH) && (_version == 3)) {
+		// This is NOT the for the Mac version of Indy3/Loom
 		VAR(39) = 320;
 	}
 
@@ -1219,6 +1221,9 @@
 	if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
 		_scummVars[74] = 1225;
 	
+	if (_version == 7)
+		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
+
 	VAR(VAR_CHARINC) = 4;
 	setTalkingActor(0);
 }

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.71
retrieving revision 1.71.2.1
diff -u -d -r1.71 -r1.71.2.1
--- vars.cpp	11 Feb 2004 15:59:25 -0000	1.71
+++ vars.cpp	3 May 2004 02:04:57 -0000	1.71.2.1
@@ -54,6 +54,14 @@
 	VAR_CUTSCENEEXIT_KEY = 24;
 	VAR_TALK_ACTOR = 25;
 	VAR_CAMERA_FAST_X = 26;
+
+	// FIXME: Apparently, in the Mac version of Loom, scumm variable 27 was
+	// used for another purpose. It is being set to values 0, 1, 2 or 3.
+	// Maybe it's some kind of 'scroll mode'. See also:
+	// http://www.scummbar.com/games/media/transcripts/maclucas.txt
+	if (!(_gameId == GID_LOOM && _features & GF_MACINTOSH))
+		VAR_SCROLL_SCRIPT = 27;
+
 	VAR_SCROLL_SCRIPT = 27;
 	VAR_ENTRY_SCRIPT = 28;
 	VAR_ENTRY_SCRIPT2 = 29;
@@ -186,6 +194,7 @@
 	VAR_PERFORMANCE_2 = 27;
 	VAR_GAME_LOADED = 29;
 	VAR_V6_EMSSPACE = 32;
+	//VAR_VOICE_MODE = 33; // 0 is voice, 1 is voice+text, 2 is text only
 	VAR_RANDOM_NR = 34;
 	VAR_NEW_ROOM = 35;
 	VAR_WALKTO_OBJ = 36;