[Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.75,1.76 display.h,1.47,1.48 logic.cpp,1.211,1.212 queen.cpp,1.102,1.103 resource.cpp,1.54,1.55 xref.txt,1.65,1.66
Gregory Montoir
cyx at users.sourceforge.net
Tue Nov 30 13:02:08 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1452/queen
Modified Files:
display.cpp display.h logic.cpp queen.cpp resource.cpp
xref.txt
Log Message:
enabled savegame loading on startup
Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- display.cpp 23 Nov 2004 22:21:26 -0000 1.75
+++ display.cpp 30 Nov 2004 21:01:24 -0000 1.76
@@ -188,6 +188,7 @@
void Display::palSetPanel() {
memcpy(_pal.room + 144 * 3, _pal.panel, (256 - 144) * 3);
+ memcpy(_pal.screen + 144 * 3, _pal.panel, (256 - 144) * 3);
}
void Display::palFadeIn(int start, int end, uint16 roomNum, bool dynalum, int16 dynaX, int16 dynaY) {
@@ -218,7 +219,7 @@
}
void Display::palFadeOut(int start, int end, uint16 roomNum) {
- debug(9, "Display::palFadeOut(%d, %d)", start, end);
+ debug(9, "Display::palFadeOut(%d, %d, %d)", start, end, roomNum);
_pal.scrollable = false;
int n = end - start + 1;
if (Logic::isAltIntroRoom(roomNum) || Logic::isIntroRoom(roomNum)) {
@@ -242,7 +243,8 @@
}
}
-void Display::palFadePanel() {
+void Display::palGreyPanel() {
+ debug(9, "Display::palGreyPanel()");
int i;
uint8 tempPal[256 * 3];
for (i = 224 * 3; i < 256 * 3; i += 3) {
Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- display.h 6 Aug 2004 17:01:58 -0000 1.47
+++ display.h 30 Nov 2004 21:01:25 -0000 1.48
@@ -48,7 +48,7 @@
void palSetPanel();
void palFadeIn(int start, int end, uint16 roomNum, bool dynalum = false, int16 dynaX = 0, int16 dynaY = 0);
void palFadeOut(int start, int end, uint16 roomNum);
- void palFadePanel();
+ void palGreyPanel();
void palScroll(int start, int end);
void palCustomColors(uint16 roomNum);
void palCustomScroll(uint16 roomNum);
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- logic.cpp 23 Nov 2004 22:21:29 -0000 1.211
+++ logic.cpp 30 Nov 2004 21:01:25 -0000 1.212
@@ -262,6 +262,7 @@
_vm->graphics()->setupMouseCursor();
setupJoe();
_vm->grid()->setupPanel();
+ inventorySetup();
_oldRoom = 0;
_newRoom = _currentRoom;
@@ -1430,7 +1431,7 @@
_vm->display()->showMouseCursor(false);
if (1 == _scene) {
- _vm->display()->palFadePanel();
+ _vm->display()->palGreyPanel();
}
_vm->update();
@@ -2059,7 +2060,6 @@
displayRoom(currentRoom(), RDM_FADE_JOE, 100, 2, true);
playCutaway("c70d.cut");
gameState(VAR_INTRO_PLAYED, 1);
- inventorySetup();
inventoryRefresh();
return true;
}
@@ -2093,7 +2093,6 @@
displayRoom(currentRoom(), RDM_FADE_NOJOE, 100, 2, true);
playCutaway("start.cut");
gameState(2, 1);
- inventorySetup();
inventoryRefresh();
return true;
}
@@ -2133,17 +2132,16 @@
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;
}
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- queen.cpp 28 Nov 2004 23:57:33 -0000 1.102
+++ queen.cpp 30 Nov 2004 21:01:25 -0000 1.103
@@ -290,6 +290,9 @@
int QueenEngine::go() {
_logic->start();
+ if (ConfMan.hasKey("save_slot") && !(_resource->isDemo() || _resource->isInterview())) {
+ loadGameState(ConfMan.getInt("save_slot"));
+ }
_quit = false;
while (!_quit) {
// queen.c lines 4080-4104
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- resource.cpp 23 Nov 2004 22:21:42 -0000 1.54
+++ resource.cpp 30 Nov 2004 21:01:25 -0000 1.55
@@ -93,8 +93,6 @@
}
} while (cur++ < _resourceEntries);
#endif
-
- debug(7, "Couldn't find file '%s'", entryName);
return re;
}
Index: xref.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/xref.txt,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- xref.txt 7 Mar 2004 10:46:02 -0000 1.65
+++ xref.txt 30 Nov 2004 21:01:25 -0000 1.66
@@ -299,7 +299,7 @@
drawpanel() Display::prepareUpdate
drawscreen() Display::update
dynalum() Display::dynalumUpdate
-fade_panel() Display::palFadePanel
+fade_panel() Display::palGreyPanel
fadein() Display::palFadeIn
fadeout() Display::palFadeOut
flashspecial() Display::palCustomFlash
More information about the Scummvm-git-logs
mailing list