From 22d1a6496cb71d8402c510f3b79470bf3d132a71 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 25 Jan 2018 19:49:53 -0500 Subject: XEEN: Fix loading of desert map --- engines/xeen/map.cpp | 2 +- engines/xeen/resources.cpp | 6 +++--- engines/xeen/resources.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp index 9da9feff37..e16dcf5cb4 100644 --- a/engines/xeen/map.cpp +++ b/engines/xeen/map.cpp @@ -1205,7 +1205,7 @@ void Map::load(int mapId) { if (_mazeData[0]._wallTypes[i] != 0) { _wallSprites._surfaces[i].load(Common::String::format("%s.wal", - Res.SURFACE_TYPE_NAMES[_mazeData[0]._wallTypes[i]])); + Res.OUTDOORS_WALL_TYPES[_mazeData[0]._wallTypes[i]])); } _surfaceSprites[i].clear(); diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp index 0ef55dc33a..96e9116d85 100644 --- a/engines/xeen/resources.cpp +++ b/engines/xeen/resources.cpp @@ -112,9 +112,9 @@ const char *const Resources::TERRAIN_TYPES[6] = { "town", "cave", "towr", "cstl", "dung", "scfi" }; -const char *const Resources::SURFACE_TYPE_NAMES[15] = { - nullptr, "mount", "ltree", "dtree", "grass", "snotree", "snomnt", - "dedltree", "mount", "lavamnt", "palm", "dmount", "dedltree", +const char *const Resources::OUTDOORS_WALL_TYPES[16] = { + nullptr, "mount", "ltree", "dtree", "grass", "snotree", "dsnotree", + "snomnt", "dedltree", "mount", "lavamnt", "palm", "dmount", "dedltree", "dedltree", "dedltree" }; diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h index 9bde8da691..11c677d53d 100644 --- a/engines/xeen/resources.h +++ b/engines/xeen/resources.h @@ -50,7 +50,7 @@ public: static const char *const IN_NO_CONDITION; static const char *const NOTHING_HERE; static const char *const TERRAIN_TYPES[6]; - static const char *const SURFACE_TYPE_NAMES[15]; + static const char *const OUTDOORS_WALL_TYPES[16]; static const char *const SURFACE_NAMES[16]; static const char *const WHO_ACTIONS[32]; static const char *const WHO_WILL_ACTIONS[4]; -- cgit v1.2.3