aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen
diff options
context:
space:
mode:
authorPaul Gilbert2018-04-25 21:19:00 -0400
committerPaul Gilbert2018-04-25 21:19:00 -0400
commitbeeddc8c7e82218ece89e2bc0d76599b38b9730f (patch)
tree20607f942b469577d19baf91a1c246da112266bd /engines/xeen
parent72d9c94289e21ca177b6c27bb4fb6df916b58ee6 (diff)
downloadscummvm-rg350-beeddc8c7e82218ece89e2bc0d76599b38b9730f.tar.gz
scummvm-rg350-beeddc8c7e82218ece89e2bc0d76599b38b9730f.tar.bz2
scummvm-rg350-beeddc8c7e82218ece89e2bc0d76599b38b9730f.zip
XEEN: Fix loading of event text in Darkside southern skyroad
Diffstat (limited to 'engines/xeen')
-rw-r--r--engines/xeen/map.cpp8
-rw-r--r--engines/xeen/map.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 6e859e17ba..9631fa62c1 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -713,7 +713,7 @@ void Map::load(int mapId) {
}
// Load any events for the new map
- loadEvents(mapId);
+ loadEvents(mapId, _loadCcNum);
// Iterate through loading the given maze as well as the two successive
// mazes in each of the four cardinal directions
@@ -1069,11 +1069,11 @@ int Map::mazeLookup(const Common::Point &pt, int layerShift, int wallMask) {
}
}
-void Map::loadEvents(int mapId) {
+void Map::loadEvents(int mapId, int ccNum) {
// Load events
Common::String filename = Common::String::format("maze%c%03d.evt",
(mapId >= 100) ? 'x' : '0', mapId);
- File fEvents(filename);
+ File fEvents(filename, ccNum);
XeenSerializer sEvents(&fEvents, nullptr);
_events.synchronize(sEvents);
fEvents.close();
@@ -1081,7 +1081,7 @@ void Map::loadEvents(int mapId) {
// Load text data
filename = Common::String::format("aaze%c%03d.txt",
(mapId >= 100) ? 'x' : '0', mapId);
- File fText(filename);
+ File fText(filename, ccNum);
_events._text.clear();
while (fText.pos() < fText.size())
_events._text.push_back(fText.readString());
diff --git a/engines/xeen/map.h b/engines/xeen/map.h
index ef27bdb8ce..4d73aec818 100644
--- a/engines/xeen/map.h
+++ b/engines/xeen/map.h
@@ -413,7 +413,7 @@ private:
/**
* Load the events for a new map
*/
- void loadEvents(int mapId);
+ void loadEvents(int mapId, int ccNum);
/**
* Save the events for a map