[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.369.2.7,1.369.2.8 scummvm.cpp,2.577.2.22,2.577.2.23 sound.cpp,1.320.2.7,1.320.2.8 vars.cpp,1.71.2.4,1.71.2.5

Travis Howell kirben at users.sourceforge.net
Sun Jul 18 06:50:02 CEST 2004


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

Modified Files:
      Tag: branch-0-6-0
	scumm.h scummvm.cpp sound.cpp vars.cpp 
Log Message:

Back port VAR fixes.


Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.369.2.7
retrieving revision 1.369.2.8
diff -u -d -r1.369.2.7 -r1.369.2.8
--- scumm.h	10 Jul 2004 04:11:38 -0000	1.369.2.7
+++ scumm.h	18 Jul 2004 13:49:31 -0000	1.369.2.8
@@ -1224,7 +1224,10 @@
 	byte VAR_ACTIVE_OBJECT2;
 	byte VAR_CLICK_AREA;
 
+	byte VAR_BLAST_ABOVE_TEXT;
 	byte VAR_VOICE_MODE;
+	byte VAR_MUSIC_BUNDLE_LOADED;
+	byte VAR_VOICE_BUNDLE_LOADED;
 };
 
 // This is a constant lookup table of reverse bit masks

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.22
retrieving revision 2.577.2.23
diff -u -d -r2.577.2.22 -r2.577.2.23
--- scummvm.cpp	17 Jul 2004 08:49:38 -0000	2.577.2.22
+++ scummvm.cpp	18 Jul 2004 13:49:31 -0000	2.577.2.23
@@ -620,7 +620,10 @@
 	VAR_VERB_ALLOWED = 0xFF;
 	VAR_CLICK_AREA = 0xFF;
 
+	VAR_BLAST_ABOVE_TEXT = 0xFF;
 	VAR_VOICE_MODE = 0xFF;
+	VAR_MUSIC_BUNDLE_LOADED = 0xFF;
+	VAR_VOICE_BUNDLE_LOADED = 0xFF;
 
 	// Use g_scumm from error() ONLY
 	g_scumm = this;
@@ -1547,7 +1550,7 @@
 		// texts have to be drawn before the blast objects. Unless
 		// someone can think of a better way to achieve this effect.
 
-		if (_gameId == GID_FT) {
+		if (_version >= 7 && VAR(VAR_BLAST_ABOVE_TEXT) == 1) {
 			drawBlastTexts();
 			drawBlastObjects();
 		} else {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.320.2.7
retrieving revision 1.320.2.8
diff -u -d -r1.320.2.7 -r1.320.2.8
--- sound.cpp	17 Jul 2004 08:27:56 -0000	1.320.2.7
+++ sound.cpp	18 Jul 2004 13:49:32 -0000	1.320.2.8
@@ -818,6 +818,9 @@
 void Sound::setupSound() {
 	delete _sfxFile;
 	_sfxFile = openSfxFile();
+
+	if (_vm->_gameId == GID_FT)
+		_vm->VAR(_vm->VAR_VOICE_BUNDLE_LOADED) = _sfxFile->isOpen();
 }
 
 void Sound::pauseSounds(bool pause) {

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.71.2.4
retrieving revision 1.71.2.5
diff -u -d -r1.71.2.4 -r1.71.2.5
--- vars.cpp	7 Jul 2004 10:09:33 -0000	1.71.2.4
+++ vars.cpp	18 Jul 2004 13:49:32 -0000	1.71.2.5
@@ -258,8 +258,13 @@
 	VAR_CHARSET_MASK = 119;
 	VAR_VIDEONAME = 123;
 	VAR_CUSTOMSCALETABLE = 131;
+	VAR_BLAST_ABOVE_TEXT = 133;
 
 	VAR_STRING2DRAW = 130;
+
+	VAR_MUSIC_BUNDLE_LOADED = 135;
+	VAR_VOICE_BUNDLE_LOADED = 136;
+
 }
 
 void ScummEngine_v8::setupScummVars() {
@@ -295,12 +300,17 @@
 
 	VAR_OVERRIDE = 30;
 	VAR_ROOM = 31;
+	VAR_NEW_ROOM = 32;
+	VAR_WALKTO_OBJ = 33;
+	VAR_TIMER = 34;
 
 	VAR_VOICE_MODE = 39; // 0 is voice, 1 is voice+text, 2 is text only
 	VAR_GAME_LOADED = 40;
 	VAR_LANGUAGE = 41;
 	
 	VAR_CURRENTDISK = 42;
+	VAR_MUSIC_BUNDLE_LOADED = 45;
+	VAR_VOICE_BUNDLE_LOADED = 46;
 
 	VAR_SCROLL_SCRIPT = 50;
 	VAR_ENTRY_SCRIPT = 51;
@@ -337,6 +347,8 @@
 	VAR_CAMERA_THRESHOLD_X = 124;
 	VAR_CAMERA_THRESHOLD_Y = 125;
 
+	VAR_BLAST_ABOVE_TEXT = 133;
+
 	VAR_EGO = 126;
 
 	VAR_DEBUGMODE = 130;





More information about the Scummvm-git-logs mailing list