diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/debugger.cpp | 1 | ||||
| -rw-r--r-- | engines/xeen/map.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/resources.cpp | 4 | ||||
| -rw-r--r-- | engines/xeen/resources.h | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/engines/xeen/debugger.cpp b/engines/xeen/debugger.cpp index 4fbef4fa15..fed030780c 100644 --- a/engines/xeen/debugger.cpp +++ b/engines/xeen/debugger.cpp @@ -160,7 +160,6 @@ bool Debugger::cmdGems(int argc, const char **argv) { } bool Debugger::cmdMap(int argc, const char **argv) { - FileManager &files = *g_vm->_files; Map &map = *g_vm->_map; Party &party = *g_vm->_party; diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp index ca17ba04aa..06c1592ed3 100644 --- a/engines/xeen/map.cpp +++ b/engines/xeen/map.cpp @@ -653,7 +653,7 @@ void Map::load(int mapId) { if (_vm->getGameID() == GType_Swords || _vm->getGameID() == GType_DarkSide) { _animationInfo.load("dark.dat"); - _monsterData.load("dark.mon"); + _monsterData.load((_vm->getGameID() == GType_Swords) ? "monsters.swd" : "dark.mon"); _wallPicSprites.load("darkpic.dat"); } else if (_vm->getGameID() == GType_Clouds) { _animationInfo.load("animinfo.cld"); diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp index e23920183f..df7545976e 100644 --- a/engines/xeen/resources.cpp +++ b/engines/xeen/resources.cpp @@ -250,7 +250,7 @@ void Resources::loadData() { file.syncString(ITEM_BROKEN); file.syncString(ITEM_CURSED); file.syncStrings(BONUS_NAMES, 7); - file.syncStrings(WEAPON_NAMES, 35); + file.syncStrings(WEAPON_NAMES, 41); file.syncStrings(ARMOR_NAMES, 14); file.syncStrings(ACCESSORY_NAMES, 11); file.syncStrings(MISC_NAMES, 22); @@ -258,6 +258,7 @@ void Resources::loadData() { file.syncStrings(ATTRIBUTE_NAMES, 10); file.syncStrings(EFFECTIVENESS_NAMES, 7); file.syncStrings(QUEST_ITEM_NAMES, 85); + file.syncStrings(QUEST_ITEM_NAMES_SWORDS, 51); file.syncNumbers((int *)WEAPON_BASE_COSTS, 35); file.syncNumbers((int *)ARMOR_BASE_COSTS, 14); file.syncNumbers((int *)ACCESSORY_BASE_COSTS, 11); @@ -324,6 +325,7 @@ void Resources::loadData() { file.syncString(TOO_DANGEROUS_TO_REST); file.syncString(SOME_CHARS_MAY_DIE); file.syncString(CANT_DISMISS_LAST_CHAR); + file.syncString(DELETE_CHAR_WITH_ELDER_WEAPON); file.syncStrings(REMOVE_DELETE, 2); file.syncString(REMOVE_OR_DELETE_WHICH); file.syncString(YOUR_PARTY_IS_FULL); diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h index 782dc3bd05..d47bc4da45 100644 --- a/engines/xeen/resources.h +++ b/engines/xeen/resources.h @@ -313,6 +313,7 @@ public: const char *ATTRIBUTE_NAMES[10]; const char *EFFECTIVENESS_NAMES[7]; const char *QUEST_ITEM_NAMES[85]; + const char *QUEST_ITEM_NAMES_SWORDS[51]; int WEAPON_BASE_COSTS[35]; int ARMOR_BASE_COSTS[14]; int ACCESSORY_BASE_COSTS[11]; @@ -379,6 +380,7 @@ public: const char *TOO_DANGEROUS_TO_REST; const char *SOME_CHARS_MAY_DIE; const char *CANT_DISMISS_LAST_CHAR; + const char *DELETE_CHAR_WITH_ELDER_WEAPON; const char *REMOVE_DELETE[2]; const char *REMOVE_OR_DELETE_WHICH; const char *YOUR_PARTY_IS_FULL; |