[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.580,2.581 string.cpp,1.195,1.196

[Travis Howell]

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

Modified Files:
	scummvm.cpp string.cpp 
Log Message:

Adjust again for V1/V2 games.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.580
retrieving revision 2.581
diff -u -d -r2.580 -r2.581
--- scummvm.cpp	21 Feb 2004 02:03:53 -0000	2.580
+++ scummvm.cpp	21 Feb 2004 06:36:40 -0000	2.581
@@ -1199,7 +1199,6 @@
 		VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen;
 	}
 	
-	_defaultTalkDelay = 60;
 	VAR(VAR_CHARINC) = 4;
 	talkingActor(0);
 }
@@ -1884,11 +1883,15 @@
 		if (_imuse)
 			_imuse->set_music_volume (vol);
 	} else if (_lastKeyHit == '-') { // - text speed down
-		if (VAR(VAR_CHARINC) < 9)
-			VAR(VAR_CHARINC) = + 1;
+		if (_defaultTalkDelay < 9)
+			_defaultTalkDelay++;
+		if (VAR_CHARINC != 0xFF)
+			VAR(VAR_CHARINC) = _defaultTalkDelay;
 	} else if (_lastKeyHit == '+') { // + text speed up
-		if (VAR(VAR_CHARINC) > 0)
-			VAR(VAR_CHARINC) -= 1;
+		if (_defaultTalkDelay > 0)
+			_defaultTalkDelay--;
+		if (VAR_CHARINC != 0xFF)
+			VAR(VAR_CHARINC) = _defaultTalkDelay;
 	} else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console
 		_debugger->attach();
 	} else if (_version <= 2) {

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- string.cpp	21 Feb 2004 02:03:53 -0000	1.195
+++ string.cpp	21 Feb 2004 06:36:40 -0000	1.196
@@ -177,7 +177,8 @@
 		_useTalkAnims = true;
 	}
 
-	_talkDelay = _defaultTalkDelay;
+	// Always set to 60
+	_talkDelay = 60;
 
 	if (!_keepText) {
 		if (_version <= 3 && _gameId != GID_LOOM) {