[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.370,1.371 scummvm.cpp,2.578,2.579 vars.cpp,1.71,1.72

Travis Howell kirben at users.sourceforge.net
Fri Feb 20 07:17:00 CET 2004


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

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

Variable should be checked at this point.


Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -d -r1.370 -r1.371
--- scumm.h	18 Feb 2004 05:20:47 -0000	1.370
+++ scumm.h	20 Feb 2004 15:04:51 -0000	1.371
@@ -1221,6 +1221,8 @@
 	byte VAR_ACTIVE_OBJECT1;
 	byte VAR_ACTIVE_OBJECT2;
 	byte VAR_CLICK_AREA;
+
+	byte VAR_BLAST_ABOVE_TEXT;
 };
 
 // This is a constant lookup table of reverse bit masks

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.578
retrieving revision 2.579
diff -u -d -r2.578 -r2.579
--- scummvm.cpp	18 Feb 2004 10:59:47 -0000	2.578
+++ scummvm.cpp	20 Feb 2004 15:04:51 -0000	2.579
@@ -617,6 +617,8 @@
 	VAR_VERB_ALLOWED = 0xFF;
 	VAR_CLICK_AREA = 0xFF;
 
+	VAR_BLAST_ABOVE_TEXT = 0xFF;
+
 	// Use g_scumm from error() ONLY
 	g_scumm = this;
 
@@ -1512,7 +1514,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: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- vars.cpp	11 Feb 2004 15:59:25 -0000	1.71
+++ vars.cpp	20 Feb 2004 15:04:51 -0000	1.72
@@ -241,6 +241,7 @@
 	VAR_CHARSET_MASK = 119;
 	VAR_VIDEONAME = 123;
 	VAR_CUSTOMSCALETABLE = 131;
+	VAR_BLAST_ABOVE_TEXT = 133;
 
 	VAR_STRING2DRAW = 130;
 }
@@ -320,6 +321,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