[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.61,1.62

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv8000/smush

Modified Files:
	smush_player.cpp 
Log Message:
replaced demo GIDs wth GF_DEMO

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- smush_player.cpp	16 Nov 2003 21:53:22 -0000	1.61
+++ smush_player.cpp	17 Nov 2003 21:16:43 -0000	1.62
@@ -828,24 +828,30 @@
 	readString(file, directory);
 
 	if (_scumm->_gameId == GID_FT) {
-		_sf[0] = new SmushFont(true, false);
-		_sf[2] = new SmushFont(true, false);
-		_sf[0]->loadFont("scummfnt.nut", directory);
-		_sf[2]->loadFont("titlfnt.nut", directory);
-	} else if (_scumm->_gameId == GID_FTDEMO) {
+		if (!(_scumm->_features & GF_DEMO)) {
+			_sf[0] = new SmushFont(true, false);
+			_sf[2] = new SmushFont(true, false);
+			_sf[0]->loadFont("scummfnt.nut", directory);
+			_sf[2]->loadFont("titlfnt.nut", directory);
+		} else {
 		_sf[0] = new SmushFont(true, false);
 		_sf[0]->loadFont("scummfnt.nut", directory);
+		}
 	} else if (_scumm->_gameId == GID_DIG) {
-		for (i = 0; i < 4; i++) {
-			sprintf(file_font, "font%d.nut", i);
-			_sf[i] = new SmushFont(i != 0, false);
-			_sf[i]->loadFont(file_font, directory);
+		if (!(_scumm->_features & GF_DEMO)) {
+			for (i = 0; i < 4; i++) {
+				sprintf(file_font, "font%d.nut", i);
+				_sf[i] = new SmushFont(i != 0, false);
+				_sf[i]->loadFont(file_font, directory);
+			}
 		}
 	} else if (_scumm->_gameId == GID_CMI) {
 		for (i = 0; i < 5; i++) {
-			sprintf(file_font, "font%d.nut", i);
-			_sf[i] = new SmushFont(false, true);
-			_sf[i]->loadFont(file_font, directory);
+			if ((!(_scumm->_features & GF_DEMO)) && (i != 5)) {
+				sprintf(file_font, "font%d.nut", i);
+				_sf[i] = new SmushFont(false, true);
+				_sf[i]->loadFont(file_font, directory);
+			}
 		}
 	} else {
 		error("SmushPlayer::setupAnim() Unknown font setup for game");