aboutsummaryrefslogtreecommitdiff
path: root/queen/logic.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-11-30 21:01:25 +0000
committerGregory Montoir2004-11-30 21:01:25 +0000
commitf2fb63ffd9b32a21d985b8e41cc272edec8f0f50 (patch)
tree4a7f21034784f54cc5652ec0db3e4ffd3abf1643 /queen/logic.cpp
parentbe58f22feb25ab840282fd38517c6c48db1b6c01 (diff)
downloadscummvm-rg350-f2fb63ffd9b32a21d985b8e41cc272edec8f0f50.tar.gz
scummvm-rg350-f2fb63ffd9b32a21d985b8e41cc272edec8f0f50.tar.bz2
scummvm-rg350-f2fb63ffd9b32a21d985b8e41cc272edec8f0f50.zip
enabled savegame loading on startup
svn-id: r15964
Diffstat (limited to 'queen/logic.cpp')
-rw-r--r--queen/logic.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/queen/logic.cpp b/queen/logic.cpp
index 777e7ec77d..d5756584c0 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -262,6 +262,7 @@ void Logic::start() {
_vm->graphics()->setupMouseCursor();
setupJoe();
_vm->grid()->setupPanel();
+ inventorySetup();
_oldRoom = 0;
_newRoom = _currentRoom;
@@ -1430,7 +1431,7 @@ void Logic::sceneStart() {
_vm->display()->showMouseCursor(false);
if (1 == _scene) {
- _vm->display()->palFadePanel();
+ _vm->display()->palGreyPanel();
}
_vm->update();
@@ -2059,7 +2060,6 @@ bool LogicDemo::preChangeRoom() {
displayRoom(currentRoom(), RDM_FADE_JOE, 100, 2, true);
playCutaway("c70d.cut");
gameState(VAR_INTRO_PLAYED, 1);
- inventorySetup();
inventoryRefresh();
return true;
}
@@ -2093,7 +2093,6 @@ bool LogicInterview::preChangeRoom() {
displayRoom(currentRoom(), RDM_FADE_NOJOE, 100, 2, true);
playCutaway("start.cut");
gameState(2, 1);
- inventorySetup();
inventoryRefresh();
return true;
}
@@ -2133,17 +2132,16 @@ bool LogicGame::preChangeRoom() {
playCutaway("cintr.cut");
} else {
playCutaway("cdint.cut");
- _vm->display()->palSetPanel();
}
playCutaway("cred.cut");
+ _vm->display()->palSetPanel();
sceneReset();
currentRoom(ROOM_HOTEL_LOBBY);
entryObj(584);
displayRoom(currentRoom(), RDM_FADE_JOE, 100, 2, true);
playCutaway("c70d.cut");
gameState(VAR_INTRO_PLAYED, 1);
- inventorySetup();
inventoryRefresh();
return true;
}