[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.111,1.112 scumm.h,1.251,1.252 scummvm.cpp,2.231,2.232 vars.cpp,1.56,1.57

Jonathan Gray khalek at users.sourceforge.net
Thu Jun 12 09:39:07 CEST 2003


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

Modified Files:
	script.cpp scumm.h scummvm.cpp vars.cpp 
Log Message:
rework loom subtitle option handing

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- script.cpp	7 Jun 2003 00:49:36 -0000	1.111
+++ script.cpp	12 Jun 2003 16:38:40 -0000	1.112
@@ -475,6 +475,10 @@
 			var = 266;
 		}
 #endif
+		if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES) {
+			return _noSubtitles;	
+		}
+		
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");
 		return _scummVars[var];
 	}
@@ -528,6 +532,10 @@
 			VAR(VAR_CHARINC) = _defaultTalkDelay / 20;
 		else
 			_scummVars[var] = value;
+
+		// stay in sync with loom cd subtitle var
+		if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES && (value == 0 || value == 1))
+			_noSubtitles = value;
 
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- scumm.h	12 Jun 2003 12:22:57 -0000	1.251
+++ scumm.h	12 Jun 2003 16:38:41 -0000	1.252
@@ -1144,7 +1144,7 @@
 	byte VAR_SOUNDRESULT;
 	byte VAR_TALKSTOP_KEY;
 	byte VAR_59;
-	byte VAR_SUBTITLES;
+	byte VAR_NOSUBTITLES;
 
 	byte VAR_SOUNDPARAM;
 	byte VAR_SOUNDPARAM2;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.231
retrieving revision 2.232
diff -u -d -r2.231 -r2.232
--- scummvm.cpp	12 Jun 2003 12:22:56 -0000	2.231
+++ scummvm.cpp	12 Jun 2003 16:38:42 -0000	2.232
@@ -480,7 +480,7 @@
 	VAR_SOUNDRESULT = 0xFF;
 	VAR_TALKSTOP_KEY = 0xFF;
 	VAR_59 = 0xFF;
-	VAR_SUBTITLES = 0xFF;
+	VAR_NOSUBTITLES = 0xFF;
 
 	VAR_SOUNDPARAM = 0xFF;
 	VAR_SOUNDPARAM2 = 0xFF;
@@ -2007,10 +2007,6 @@
 		VAR(VAR_CHARINC) = _defaultTalkDelay / 20;
 	} else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console
 		g_debugger->attach(this, NULL);
-	// F9 toggles subtitles for loomcd
-	} else if (_gameId == GID_LOOM256 && _lastKeyHit == 323) {
-		_noSubtitles = !_noSubtitles;
-		VAR(VAR_SUBTITLES) = !_noSubtitles;
 	}
 
 	_mouseButStat = _lastKeyHit;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- vars.cpp	12 Jun 2003 12:22:57 -0000	1.56
+++ vars.cpp	12 Jun 2003 16:38:43 -0000	1.57
@@ -83,7 +83,7 @@
 	VAR_SOUNDRESULT = 56;
 	VAR_TALKSTOP_KEY = 57;
 	VAR_59 = 59;
-	VAR_SUBTITLES = 60; // for loomcd
+	VAR_NOSUBTITLES = 60; // for loomcd
 
 	VAR_SOUNDPARAM = 64;
 	VAR_SOUNDPARAM2 = 65;





More information about the Scummvm-git-logs mailing list