[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.427,1.428 scumm.cpp,1.102,1.103 vars.cpp,1.92,1.93

[Travis Howell]

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

Modified Files:
	scumm.h scumm.cpp vars.cpp 
Log Message:

Enable VAR_FADE_DELAY


Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -d -r1.427 -r1.428
--- scumm.h	22 Jul 2004 04:13:46 -0000	1.427
+++ scumm.h	24 Jul 2004 04:36:54 -0000	1.428
@@ -1204,6 +1204,7 @@
 	byte VAR_USERPUT;
 	byte VAR_SOUNDRESULT;
 	byte VAR_TALKSTOP_KEY;
+	byte VAR_FADE_DELAY;
 	byte VAR_NOSUBTITLES;
 
 	byte VAR_SOUNDPARAM;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- scumm.cpp	24 Jul 2004 04:18:26 -0000	1.102
+++ scumm.cpp	24 Jul 2004 04:36:54 -0000	1.103
@@ -668,6 +668,7 @@
 	VAR_USERPUT = 0xFF;
 	VAR_SOUNDRESULT = 0xFF;
 	VAR_TALKSTOP_KEY = 0xFF;
+	VAR_FADE_DELAY = 0xFF;
 	VAR_NOSUBTITLES = 0xFF;
 
 	VAR_SOUNDPARAM = 0xFF;
@@ -1350,10 +1351,6 @@
 			VAR(VAR_MOUSEPRESENT) = true;
 		if (_version == 6)
 			VAR(VAR_V6_EMSSPACE) = 10000;
-
-		// Sets fade delay
-		// byte VAR_FADE_DELAY = (_version == 7) ? 117 : 59;
-		// VAR(VAR_FADE_DELAY) = 3;
 	}
 	
 	if ((_features & GF_MACINTOSH) && (_version == 3)) {
@@ -1374,6 +1371,9 @@
 		VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
 	}
 
+	if (VAR_FADE_DELAY != 0xFF)
+		VAR(VAR_FADE_DELAY) = 3;
+		
 	VAR(VAR_CHARINC) = 4;
 	setTalkingActor(0);
 }

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- vars.cpp	24 Jul 2004 02:18:05 -0000	1.92
+++ vars.cpp	24 Jul 2004 04:36:54 -0000	1.93
@@ -91,6 +91,7 @@
 		VAR_SOUNDPARAM3 = 66;
 	}
 	if (_version >= 5) {
+		VAR_FADE_DELAY = 59;
 		VAR_MOUSEPRESENT = 67;
 		VAR_PERFORMANCE_1 = 68;
 		VAR_PERFORMANCE_2 = 69;	// Zak256 Note: Cashcard for Zak
@@ -335,6 +336,7 @@
 	VAR_DEFAULT_TALK_DELAY = 114;
 	VAR_CHARINC = 115;
 	VAR_DEBUGMODE = 116;
+	VAR_FADE_DELAY = 117;
 
 	// Full Throttle specific	
 	VAR_CHARSET_MASK = 119;