[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.79,1.80 scumm.h,1.422,1.423 vars.cpp,1.87,1.88

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Jul 3 23:15:07 CEST 2004


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

Modified Files:
	scumm.cpp scumm.h vars.cpp 
Log Message:
added code for bundle script vars

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- scumm.cpp	4 Jul 2004 00:10:30 -0000	1.79
+++ scumm.cpp	4 Jul 2004 06:14:17 -0000	1.80
@@ -727,6 +727,8 @@
 	VAR_BLAST_ABOVE_TEXT = 0xFF;
 	VAR_VOICE_MODE = 0xFF;
 	VAR_NUM_GLOBAL_OBJS = 0xFF;
+	VAR_MUSIC_BUNDLE_LOADED = 0xFF;
+	VAR_VOICE_BUNDLE_LOADED = 0xFF;
 
 	// Use g_scumm from error() ONLY
 	g_scumm = this;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -d -r1.422 -r1.423
--- scumm.h	3 Jul 2004 23:58:30 -0000	1.422
+++ scumm.h	4 Jul 2004 06:14:17 -0000	1.423
@@ -1262,6 +1262,8 @@
 	byte VAR_BLAST_ABOVE_TEXT;
 	byte VAR_VOICE_MODE;
 	byte VAR_NUM_GLOBAL_OBJS;
+	byte VAR_MUSIC_BUNDLE_LOADED;
+	byte VAR_VOICE_BUNDLE_LOADED;
 };
 
 // This is a constant lookup table of reverse bit masks

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- vars.cpp	3 Jul 2004 23:58:30 -0000	1.87
+++ vars.cpp	4 Jul 2004 06:14:17 -0000	1.88
@@ -348,8 +348,8 @@
 
 	VAR_STRING2DRAW = 130;
 
-	//VAR_MUSIC_BUNDLE_LOADED = 135;
-	//VAR_VOICE_BUNDLE_LOADED = 136;
+	VAR_MUSIC_BUNDLE_LOADED = 135;
+	VAR_VOICE_BUNDLE_LOADED = 136;
 
 }
 
@@ -394,8 +394,8 @@
 	VAR_LANGUAGE = 41;
 	
 	VAR_CURRENTDISK = 42;
-	//VAR_MUSIC_BUNDLE_LOADED = 45;
-	//VAR_VOICE_BUNDLE_LOADED = 46;
+	VAR_MUSIC_BUNDLE_LOADED = 45;
+	VAR_VOICE_BUNDLE_LOADED = 46;
 
 	VAR_SCROLL_SCRIPT = 50;
 	VAR_ENTRY_SCRIPT = 51;





More information about the Scummvm-git-logs mailing list