[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.29,1.30

Gregory Montoir cyx at users.sourceforge.net
Tue Nov 4 06:44:41 CET 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv10581

Modified Files:
	queen.cpp 
Log Message:
display PCGames splash screen for demo version

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- queen.cpp	3 Nov 2003 03:42:20 -0000	1.29
+++ queen.cpp	4 Nov 2003 14:43:53 -0000	1.30
@@ -125,17 +125,24 @@
 
 	if (_logic->currentRoom() == 7) {
 		warning("Room 7 not yet handled!");
-		// XXX R_MAP();
+		// _logic->handlePinnacleRoom();
 		// XXX fadeout(0,223);
 	}
 	else if (_logic->currentRoom() == FOTAQ_LOGO && _logic->gameState(VAR_INTRO_PLAYED) == 0) {
+		bool pcGamesDemo = _resource->isDemo() && !_resource->exists("pclogo.cut");
+
+		if (pcGamesDemo) {
+			_logic->currentRoom(79);
+		}
 		_logic->roomDisplay(_logic->roomName(_logic->currentRoom()), RDM_FADE_NOJOE, 100, 2, true);
 
 		if (_resource->isDemo()) {
-			if (_resource->exists("pclogo.cut"))
-				_logic->playCutaway("pclogo.cut");
-			else
+			if (pcGamesDemo) {
 				_logic->playCutaway("clogo.cut");
+			}
+			else {
+				_logic->playCutaway("pclogo.cut");
+			}
 		}
 		else {
 			_logic->playCutaway("copy.cut");
@@ -151,7 +158,7 @@
 			_logic->playCutaway("cred.cut");
 		}
 
-		_logic->currentRoom(ROOM_HOTEL_UPSTAIRS);
+		_logic->currentRoom(ROOM_HOTEL_LOBBY); //ROOM_HOTEL_UPSTAIRS);
 		_logic->entryObj(584);
 
 		_logic->roomDisplay(_logic->roomName(_logic->currentRoom()), RDM_FADE_JOE, 100, 2, true);





More information about the Scummvm-git-logs mailing list