aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/parallaction/disk.cpp12
-rw-r--r--engines/parallaction/disk.h2
-rw-r--r--engines/parallaction/location.cpp8
3 files changed, 14 insertions, 8 deletions
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp
index 8e33816415..317f8932da 100644
--- a/engines/parallaction/disk.cpp
+++ b/engines/parallaction/disk.cpp
@@ -426,4 +426,16 @@ void loadScenery(const char *filename) {
loadBackground(path);
}
+void loadBackground(const char* background, const char* mask) {
+
+ loadScenery(background);
+
+ if (scumm_stricmp(background, mask)) {
+ // load external masks and paths only for certain locations
+ loadMaskAndPath(mask);
+ }
+
+}
+
+
} // namespace Parallaction
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 27b6012d9f..8d1bed99f4 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -83,7 +83,7 @@ void loadStatic(const char* name, StaticCnv* cnv);
void loadFrames(const char* name, Cnv* cnv);
void loadSlide(const char *filename);
void loadScenery(const char *filename);
-void loadMaskAndPath(const char *name);
+void loadBackground(const char* background, const char* mask);
} // namespace Parallaction
diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp
index 84db62aa03..2b38678ebd 100644
--- a/engines/parallaction/location.cpp
+++ b/engines/parallaction/location.cpp
@@ -278,13 +278,7 @@ void switchBackground(const char* background, const char* mask) {
_vm->_graphics->palUnk0(palette);
}
- loadScenery(background);
- _vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBit2);
-
- if (scumm_stricmp(background, mask)) {
- // load external masks and paths only for certain locations
- loadMaskAndPath(mask);
- }
+ loadBackground(background, mask);
return;
}