aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNipun Garg2019-06-07 17:48:42 +0530
committerEugene Sandulenko2019-09-03 17:16:44 +0200
commit712caa6620b29c6812f544b5a8b532d1f08510a9 (patch)
tree1aa91eb71e8de2b17d35a31aebca0166bb8d24ff
parent500f747f076a6237af235a08da0c002a99b8618d (diff)
downloadscummvm-rg350-712caa6620b29c6812f544b5a8b532d1f08510a9.tar.gz
scummvm-rg350-712caa6620b29c6812f544b5a8b532d1f08510a9.tar.bz2
scummvm-rg350-712caa6620b29c6812f544b5a8b532d1f08510a9.zip
HDB: Fix breaking changes in MapLoader
-rw-r--r--engines/hdb/hdb.h1
-rw-r--r--engines/hdb/map-loader.cpp9
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index a8b863764e..a07e77ec0c 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -84,7 +84,6 @@ public:
FileMan *fileMan;
LuaScript *lua;
- MapLoader *mapLoader;
// Game related members;
diff --git a/engines/hdb/map-loader.cpp b/engines/hdb/map-loader.cpp
index 316d1830c9..e529d7959f 100644
--- a/engines/hdb/map-loader.cpp
+++ b/engines/hdb/map-loader.cpp
@@ -47,24 +47,24 @@ bool Map::load(Common::SeekableReadStream *stream) {
// Reading Background
_background = new uint16[_width * _height];
stream->seek(_backgroundOffset);
- for (int i = 0; i < _width * _height; i++) {
+ for (uint i = 0; i < _width * _height; i++) {
_background[i] = stream->readUint16LE();
}
// Reading Foreground
_foreground = new uint16[_width * _height];
stream->seek(_foregroundOffset);
- for (int i = 0; i < _width * _height; i++) {
+ for (uint i = 0; i < _width * _height; i++) {
_foreground[i] = stream->readUint16LE();
}
// Reading Icon List
_iconList = new MSMIcon[_iconNum];
- for (int i = 0; i < _iconNum; i++) {
+ for (uint i = 0; i < _iconNum; i++) {
_iconList[i].icon = stream->readUint16LE();
_iconList[i].x = stream->readUint16LE();
_iconList[i].y = stream->readUint16LE();
-
+
stream->read(_iconList[i].funcInit, 32);
stream->read(_iconList[i].funcAction, 32);
stream->read(_iconList[i].funcUse, 32);
@@ -134,3 +134,4 @@ int MapLoader::loadTiles() {
}
#endif
}
+}