[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.48,1.49 maketext.cpp,1.34,1.35 resman.cpp,1.79,1.80 sound.cpp,1.36,1.37 sword2.cpp,1.94,1.95

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv9741

Modified Files:
	anims.cpp maketext.cpp resman.cpp sound.cpp sword2.cpp 
Log Message:
The game sets its own DEMO variable, so we might as well check that one as
checking the GF_DEMO flag. (There's still one "unnecessary" reference to
GF_DEMO in functions.cpp, but I plan on rewriting that function soon so I
don't want to touch it right now.)


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- anims.cpp	28 Dec 2003 15:08:11 -0000	1.48
+++ anims.cpp	29 Dec 2003 15:30:10 -0000	1.49
@@ -714,7 +714,7 @@
 
 	MoviePlayer player(_vm);
 
-	if (_sequenceTextLines && !(_vm->_features & GF_DEMO))
+	if (_sequenceTextLines && !DEMO)
 		rv = player.play(filename, sequenceSpeechArray, leadOut);
 	else
 		rv = player.play(filename, NULL, leadOut);

Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- maketext.cpp	28 Dec 2003 15:08:11 -0000	1.34
+++ maketext.cpp	29 Dec 2003 15:30:10 -0000	1.35
@@ -576,7 +576,7 @@
 
 	// Get the text line - skip the 2 chars containing the wavId
 
-	if (_features & GF_DEMO)
+	if (DEMO)
 		textLine = fetchTextLine(textFile, 451) + 2;
 	else
 		textLine = fetchTextLine(textFile, 54) + 2;

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- resman.cpp	28 Dec 2003 15:08:11 -0000	1.79
+++ resman.cpp	29 Dec 2003 15:30:10 -0000	1.80
@@ -431,7 +431,7 @@
 			// playing a demo, then we're in trouble if the file
 			// can't be found!
 
-			if ((_vm->_features & GF_DEMO) || (_cdTab[parent_res_file] & LOCAL_PERM))
+			if (DEMO || (_cdTab[parent_res_file] & LOCAL_PERM))
 				error("Could not find '%s'", _resourceFiles[parent_res_file]);
 
 			getCd(_cdTab[parent_res_file] & 3);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- sound.cpp	28 Dec 2003 15:08:11 -0000	1.36
+++ sound.cpp	29 Dec 2003 15:30:10 -0000	1.37
@@ -361,7 +361,7 @@
 
 	// add the appropriate file extension & play it
 
-	if (_vm->_features & GF_DEMO) {
+	if (DEMO) {
 		// The demo I found didn't come with any music file, but you
 		// could use the music from the first CD of the complete game,
 		// I suppose...

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- sword2.cpp	28 Dec 2003 15:08:11 -0000	1.94
+++ sword2.cpp	29 Dec 2003 15:30:10 -0000	1.95
@@ -247,10 +247,10 @@
 	initFxQueue();
 
 	// all demos (not just web)
-	if (_features & GF_DEMO) {
-		// set script variable
+	if (_features & GF_DEMO)
 		DEMO = 1;
-	}
+	else
+		DEMO = 0;
 
 	return 0;
 }
@@ -366,7 +366,7 @@
 						pauseGame();
 					break;
 				case 'c':
-					if (!(_features & GF_DEMO))
+					if (!DEMO)
 						_logic->fnPlayCredits(NULL);
 					break;
 #ifdef _SWORD2_DEBUG
@@ -420,7 +420,7 @@
 	debug(5, "startGame() STARTING:");
 
 	// all demos not just web
-	if (_features & GF_DEMO)
+	if (DEMO)
 		screen_manager_id = 19;		// DOCKS SECTION START
 	else
 		screen_manager_id = 949;	// INTRO & PARIS START