aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/voyeur/files.h10
-rw-r--r--engines/voyeur/graphics.cpp2
-rw-r--r--engines/voyeur/voyeur.cpp7
3 files changed, 13 insertions, 6 deletions
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index f14b744721..6fc7ad7d0b 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -469,11 +469,6 @@ private:
void clearButtonFlag(int idx, byte bits);
/**
- * Loads data needed for displaying the initial apartment screen
- */
- void loadTheApt();
-
- /**
* Frees the apartment screen data
*/
void freeTheApt();
@@ -534,6 +529,11 @@ public:
*/
int doApt();
+ /**
+ * Loads data needed for displaying the initial apartment screen
+ */
+ void loadTheApt();
+
void checkForMurder();
void checkForIncriminate();
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index 1e21818450..6c62c6f041 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -751,7 +751,7 @@ void GraphicsManager::drawDot() {
}
void GraphicsManager::synchronize(Common::Serializer &s) {
- warning("TODO: GraphicsManager::synchronize");
+ s.syncBytes(&_VGAColors[0], PALETTE_SIZE);
}
} // End of namespace Voyeur
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 72678fa6f0..c70bb20f4b 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -687,6 +687,7 @@ void VoyeurEngine::loadGame(int slot) {
return;
Common::Serializer serializer(saveFile, NULL);
+ _checkTransitionId = _voy._transitionId;
// Read in the savegame header
VoyeurSavegameHeader header;
@@ -700,6 +701,12 @@ void VoyeurEngine::loadGame(int slot) {
synchronize(serializer);
delete saveFile;
+
+ // Show a transition card if the time index has changed
+ checkTransition();
+
+ // Load the apartment
+ _mainThread->loadTheApt();
}
/**