[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.25,1.26 scummvm.cpp,2.16,2.17

Max Horn fingolfin at users.sourceforge.net
Thu Dec 26 15:06:01 CET 2002


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

Modified Files:
	script_v6.cpp scummvm.cpp 
Log Message:
doSentence only takes three params in V8

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- script_v6.cpp	26 Dec 2002 21:50:13 -0000	1.25
+++ script_v6.cpp	26 Dec 2002 23:05:19 -0000	1.26
@@ -1138,7 +1138,8 @@
 	int a, b, c;
 
 	a = pop();
-	pop();												//dummy pop
+	if (!(_features & GF_AFTER_V8))
+		pop();	// dummy pop
 	b = pop();
 	c = pop();
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- scummvm.cpp	26 Dec 2002 02:13:19 -0000	2.16
+++ scummvm.cpp	26 Dec 2002 23:05:19 -0000	2.17
@@ -1168,13 +1168,13 @@
 		if (_imuse)
 			_imuse->set_music_volume (vol);
 	} else if (_lastKeyHit == '-') { // - text speed down
-		_defaultTalkDelay+=5;
+		_defaultTalkDelay += 5;
 		if (_defaultTalkDelay > 90)
 			_defaultTalkDelay = 90;
 
 		_vars[VAR_CHARINC] = _defaultTalkDelay / 20;
 	} else if (_lastKeyHit == '+') { // + text speed up
-		_defaultTalkDelay-=5;
+		_defaultTalkDelay -= 5;
 		if (_defaultTalkDelay < 5)
 			_defaultTalkDelay = 5;
 





More information about the Scummvm-git-logs mailing list