[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.140.2.3,1.140.2.4 saveload.h,1.32.2.1,1.32.2.2 scummvm.cpp,2.577.2.13,2.577.2.14

Travis Howell kirben at users.sourceforge.net
Mon May 3 04:03:07 CEST 2004


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

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

Back port subtitle speed changes (Done)


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.140.2.3
retrieving revision 1.140.2.4
diff -u -d -r1.140.2.3 -r1.140.2.4
--- saveload.cpp	3 May 2004 10:57:43 -0000	1.140.2.3
+++ saveload.cpp	3 May 2004 11:02:13 -0000	1.140.2.4
@@ -184,6 +184,14 @@
 	if (_screenTop < 0)
 		_screenTop = 0;
 	
+	if (hdr.ver < VER(30)) {
+		// For a long time, we used incorrect location, causing it to default to zero.
+		if (_version == 8)
+			_scummVars[VAR_CHARINC] = (_features & GF_DEMO) ? 3 : 1;
+		// Needed due to subtitle speed changes
+		_defaultTalkDelay /= 20;
+	}
+
 	// For a long time, we used incorrect locations for some camera related
 	// scumm vars. We now know the proper locations. To be able to properly use
 	// old save games, we update the old (bad) variables to the new (correct)

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -d -r1.32.2.1 -r1.32.2.2
--- saveload.h	17 Feb 2004 00:44:12 -0000	1.32.2.1
+++ saveload.h	3 May 2004 11:02:13 -0000	1.32.2.2
@@ -32,7 +32,7 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 29
+#define CURRENT_VER 30
 
 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
 // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.13
retrieving revision 2.577.2.14
diff -u -d -r2.577.2.13 -r2.577.2.14
--- scummvm.cpp	3 May 2004 10:57:47 -0000	2.577.2.13
+++ scummvm.cpp	3 May 2004 11:02:13 -0000	2.577.2.14
@@ -643,7 +643,6 @@
 			ConfMan.set("subtitles", !ConfMan.getBool("nosubtitles"));
 	}
 	_confirmExit = ConfMan.getBool("confirm_exit");
-	_defaultTalkDelay = ConfMan.getInt("talkspeed");
 	_native_mt32 = ConfMan.getBool("native_mt32");
 	// TODO: We shouldn't rely on the global Language values matching those COMI etc. expect.
 	// Rather we should explicitly translate them.
@@ -1910,17 +1909,15 @@
 		if (_imuse)
 			_imuse->set_music_volume (vol);
 	} else if (_lastKeyHit == '-') { // - text speed down
-		_defaultTalkDelay += 5;
-		if (_defaultTalkDelay > 90)
-			_defaultTalkDelay = 90;
-
-		VAR(VAR_CHARINC) = _defaultTalkDelay / 20;
+		if (_defaultTalkDelay < 9)
+			_defaultTalkDelay++;
+		if (VAR_CHARINC != 0xFF)
+			VAR(VAR_CHARINC) = _defaultTalkDelay;
 	} else if (_lastKeyHit == '+') { // + text speed up
-		_defaultTalkDelay -= 5;
-		if (_defaultTalkDelay < 5)
-			_defaultTalkDelay = 5;
-
-		VAR(VAR_CHARINC) = _defaultTalkDelay / 20;
+		if (_defaultTalkDelay > 0)
+			_defaultTalkDelay--;
+		if (VAR_CHARINC != 0xFF)
+			VAR(VAR_CHARINC) = _defaultTalkDelay;
 	} else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console
 		_debugger->attach();
 	} else if (_version <= 2) {





More information about the Scummvm-git-logs mailing list