[Scummvm-git-logs] scummvm master -> beeddc8c7e82218ece89e2bc0d76599b38b9730f
dreammaster
dreammaster at scummvm.org
Thu Apr 26 03:19:06 CEST 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
beeddc8c7e XEEN: Fix loading of event text in Darkside southern skyroad
Commit: beeddc8c7e82218ece89e2bc0d76599b38b9730f
https://github.com/scummvm/scummvm/commit/beeddc8c7e82218ece89e2bc0d76599b38b9730f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-25T21:19:00-04:00
Commit Message:
XEEN: Fix loading of event text in Darkside southern skyroad
Changed paths:
engines/xeen/map.cpp
engines/xeen/map.h
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 6e859e1..9631fa6 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 ef27bdb..4d73aec 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
More information about the Scummvm-git-logs
mailing list