[Scummvm-git-logs] scummvm master -> 8c4f90893d3ab43e2b01441921a138688f8696a3
dreammaster
dreammaster at scummvm.org
Thu Mar 29 03:03:16 CEST 2018
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8c86a18806 XEEN: Fix missing message for when all Guild spells bought
fc8915bce0 XEEN: String fixes in create_xeen
8c4f90893d XEEN: Add data for Swords of Xeen to create_xeen
Commit: 8c86a18806d4afc5a28cbfa1eb9b499a5a9d0ff1
https://github.com/scummvm/scummvm/commit/8c86a18806d4afc5a28cbfa1eb9b499a5a9d0ff1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-28T20:49:44-04:00
Commit Message:
XEEN: Fix missing message for when all Guild spells bought
Changed paths:
devtools/create_xeen/constants.cpp
engines/xeen/character.cpp
engines/xeen/dialogs/dialogs_spells.cpp
engines/xeen/locations.cpp
engines/xeen/resources.cpp
engines/xeen/resources.h
diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index 8d9ddd8..6f2b974 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -950,7 +950,7 @@ const char *const TEMPLE_TEXT =
const char *const EXPERIENCE_FOR_LEVEL =
"%s needs %lu experience for level %u.";
-const char *const LEARNED_ALL = "%s has learned all we can teach!";
+const char *const TRAINING_LEARNED_ALL = "%s has learned all we can teach!";
const char *const ELIGIBLE_FOR_LEVEL = "%s is eligible for level %u.\x3l\n"
"\v081Cost\x3r\t000%u";
@@ -1087,6 +1087,9 @@ const int SPELL_GEM_COST[77] = {
const char *const NOT_A_SPELL_CASTER = "Not a spell caster...";
+const char *const SPELLS_LEARNED_ALL = "You have learned all we\n"
+ "\t010can teach you.";
+
const char *const SPELLS_FOR = "\r\fd%s\x2\x3""c\t000\v002Spells for %s";
const char *const SPELL_LINES_0_TO_9 =
@@ -1992,7 +1995,7 @@ void writeConstants(CCArchive &cc) {
file.syncString(FOOD_AND_DRINK);
file.syncString(TEMPLE_TEXT);
file.syncString(EXPERIENCE_FOR_LEVEL);
- file.syncString(LEARNED_ALL);
+ file.syncString(TRAINING_LEARNED_ALL);
file.syncString(ELIGIBLE_FOR_LEVEL);
file.syncString(TRAINING_TEXT);
file.syncString(GOLD_GEMS);
@@ -2014,6 +2017,7 @@ void writeConstants(CCArchive &cc) {
file.syncNumbers2D((const int *)DARK_SPELL_RANGES, 12, 2);
file.syncNumbers((const int *)SPELL_GEM_COST, 77);
file.syncString(NOT_A_SPELL_CASTER);
+ file.syncString(SPELLS_LEARNED_ALL);
file.syncString(SPELLS_FOR);
file.syncString(SPELL_LINES_0_TO_9);
file.syncString(SPELLS_DIALOG_SPELLS);
diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 810c765..333bad8 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -1197,6 +1197,7 @@ void Character::addHitPoints(int amount) {
intf.drawParty(true);
}
+ assert(_currentHp < 65000);
Common::fill(&intf._charFX[0], &intf._charFX[MAX_ACTIVE_PARTY], 0);
}
@@ -1211,6 +1212,7 @@ void Character::subtractHitPoints(int amount) {
// Subtract the given HP amount
_currentHp -= amount;
bool flag = _currentHp <= 10;
+ assert(_currentHp < 65000);
if (_currentHp < 1) {
int v = getMaxHP() + _currentHp;
diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index 296bf29..a14d4ba 100644
--- a/engines/xeen/dialogs/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -356,7 +356,7 @@ const char *SpellsDialog::setSpellText(Character *c, int mode) {
}
}
- return nullptr;
+ return _spells.empty() ? Res.SPELLS_LEARNED_ALL : nullptr;
}
/*------------------------------------------------------------------------*/
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index f1d5348..7236217 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -1042,7 +1042,7 @@ Common::String TrainingLocation::createLocationText(Character &ch) {
} else if (ch._level._permanent >= _maxLevel) {
// At maximum level
_experienceToNextLevel = 1;
- msg = Common::String::format(Res.LEARNED_ALL, ch._name.c_str());
+ msg = Common::String::format(Res.TRAINING_LEARNED_ALL, ch._name.c_str());
} else {
// Eligble for level increase
uint cost = ch._level._permanent * ch._level._permanent * 10;
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index 7c804b1..e239201 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -166,7 +166,7 @@ void Resources::loadData() {
file.syncString(FOOD_AND_DRINK);
file.syncString(TEMPLE_TEXT);
file.syncString(EXPERIENCE_FOR_LEVEL);
- file.syncString(LEARNED_ALL);
+ file.syncString(TRAINING_LEARNED_ALL);
file.syncString(ELIGIBLE_FOR_LEVEL);
file.syncString(TRAINING_TEXT);
file.syncString(GOLD_GEMS);
@@ -188,6 +188,7 @@ void Resources::loadData() {
file.syncNumbers2D((int *)DARK_SPELL_RANGES, 12, 2);
file.syncNumbers((int *)SPELL_GEM_COST, 77);
file.syncString(NOT_A_SPELL_CASTER);
+ file.syncString(SPELLS_LEARNED_ALL);
file.syncString(SPELLS_FOR);
file.syncString(SPELL_LINES_0_TO_9);
file.syncString(SPELLS_DIALOG_SPELLS);
diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h
index 3e70987..782dc3b 100644
--- a/engines/xeen/resources.h
+++ b/engines/xeen/resources.h
@@ -220,7 +220,7 @@ public:
const char *FOOD_AND_DRINK;
const char *TEMPLE_TEXT;
const char *EXPERIENCE_FOR_LEVEL;
- const char *LEARNED_ALL;
+ const char *TRAINING_LEARNED_ALL;
const char *ELIGIBLE_FOR_LEVEL;
const char *TRAINING_TEXT;
const char *GOLD_GEMS;
@@ -243,6 +243,7 @@ public:
int SPELL_LEVEL_OFFSETS[3][39];
int SPELL_GEM_COST[77];
const char *NOT_A_SPELL_CASTER;
+ const char *SPELLS_LEARNED_ALL;
const char *SPELLS_FOR;
const char *SPELL_LINES_0_TO_9;
const char *SPELLS_DIALOG_SPELLS;
Commit: fc8915bce04d9ce2251aafa2089dcfe3d2ad7b81
https://github.com/scummvm/scummvm/commit/fc8915bce04d9ce2251aafa2089dcfe3d2ad7b81
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-28T20:49:44-04:00
Commit Message:
XEEN: String fixes in create_xeen
Changed paths:
devtools/create_xeen/constants.cpp
diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index 6f2b974..d888886 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -1131,7 +1131,7 @@ const char *const FIRE_RESISTENCE_TEXT = "%c%sFire%s%u";
const char *const ELECRICITY_RESISTENCE_TEXT = "%c%sElectricity%s%u";
-const char *const COLD_RESISTENCE_TEXT = "c%sCold%s%u";
+const char *const COLD_RESISTENCE_TEXT = "%c%sCold%s%u";
const char *const POISON_RESISTENCE_TEXT = "%c%sPoison/Acid%s%u";
@@ -1223,7 +1223,7 @@ const char *const RESISTENCES_TEXT =
"\t020Energy\t100%u\n"
"\t020Magic\t100%u";
-const char *const NONE = "\n\t020";
+const char *const NONE = "\n\t020None";
const char *const EXPERIENCE_TEXT = "\x2\x3""c%s\x3l\n"
"\t010Current:\t070%lu\n"
@@ -1310,9 +1310,8 @@ const char *const ACCESSORY_NAMES[11] = {
const char *const MISC_NAMES[22] = {
nullptr, "rod ", "jewel ", "gem ", "box ", "orb ", "horn ", "coin ",
- "wand ", "whistle ", "potion ", "scroll ", "RogueVM",
- "bogusg", "bogus", "bogus", "bogus", "bogus",
- "bogus", "bogus", "bogus", "bogus"
+ "wand ", "whistle ", "potion ", "scroll ", "bogus", "bogus", "bogus",
+ "bogus", "bogus", "bogus", "bogus", "bogus", "bogus", "bogus"
};
const char *const ELEMENTAL_NAMES[6] = {
Commit: 8c4f90893d3ab43e2b01441921a138688f8696a3
https://github.com/scummvm/scummvm/commit/8c4f90893d3ab43e2b01441921a138688f8696a3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-28T20:49:44-04:00
Commit Message:
XEEN: Add data for Swords of Xeen to create_xeen
Changed paths:
A devtools/create_xeen/swords.cpp
A devtools/create_xeen/swords.h
devtools/create_xeen/cc.h
devtools/create_xeen/constants.cpp
devtools/create_xeen/create_xeen.cpp
devtools/create_xeen/module.mk
dists/engine-data/xeen.ccs
engines/xeen/debugger.cpp
engines/xeen/map.cpp
engines/xeen/resources.cpp
engines/xeen/resources.h
diff --git a/devtools/create_xeen/cc.h b/devtools/create_xeen/cc.h
index 47a5112..3220abb 100644
--- a/devtools/create_xeen/cc.h
+++ b/devtools/create_xeen/cc.h
@@ -81,6 +81,10 @@ public:
loadIndex();
}
+ ~CCArchive() {
+ _file.close();
+ }
+
/**
* In write mode, finishes the CC file, writing out the resulting content
*/
diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index d888886..084b261 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -1288,13 +1288,15 @@ const char *const BONUS_NAMES[7] = {
"Bug Zapper", "Monster Masher", "Beast Bopper"
};
-const char *const WEAPON_NAMES[35] = {
+const char *const WEAPON_NAMES[41] = {
nullptr, "long sword ", "short sword ", "broad sword ", "scimitar ",
"cutlass ", "sabre ", "club ", "hand axe ", "katana ", "nunchakas ",
"wakazashi ", "dagger ", "mace ", "flail ", "cudgel ", "maul ", "spear ",
"bardiche ", "glaive ", "halberd ", "pike ", "flamberge ", "trident ",
"staff ", "hammer ", "naginata ", "battle axe ", "grand axe ", "great axe ",
- "short bow ", "long bow ", "crossbow ", "sling ", "Xeen Slayer Sword"
+ "short bow ", "long bow ", "crossbow ", "sling ", "Xeen Slayer Sword",
+ "Elder LongSword", "Elder Dagger ", "Elder Mace ", "Elder Spear ",
+ "Elder Staff ", "Elder LongBow "
};
const char *const ARMOR_NAMES[14] = {
@@ -1415,6 +1417,21 @@ const char *const QUEST_ITEM_NAMES[85] = {
"Energy Disk"
};
+const char *QUEST_ITEM_NAMES_SWORDS[51] = {
+ "Pass to Hart", "Pass to Impery", "Pass to town3", "Pass to town4", "Pass to town5",
+ "Key to Hart Sewers", "Key to Rettig's Pyramid", "Key to the Old Temple",
+ "Key to Canegtut's Pyramid", "Key to Ascihep's Pyramid", "Key to Dragon Tower",
+ "Key to Darkstone Tower", "Key to Temple of Bark", "Key to Dungeon of Lost Souls",
+ "Key to Ancient Pyramid", "Key to Dungeon of Death", "Red Magic Hammer",
+ "Green Magic Hammer", "Golden Magic Wand", "Silver Magic Hammer", "Magic Coin",
+ "Ruby", "Diamond Mineral", "Emerald", "Sapphire", "Treasure Map (Goto E1 x1, y11)",
+ "NOTUSED", "Melon", "Princess Crown", "Emerald Wand", "Druid Carving", "High Sign",
+ "Holy Wheel", "Double Cross", "Sky Hook", "Sacred Cow", "Staff of the Mountain",
+ "Hard Rock", "Soft Rock", "Rock Candy", "Ivy Plant", "Spirit Gem", "Temple of Sun holy lamp oil",
+ "Noams Hammer", "Positive Orb", "Negative Orb", "FireBane Staff", "Diamond Edged Pick",
+ "Monga Melon", "Energy Disk", "Old XEEN Quest Item"
+};
+
const int WEAPON_BASE_COSTS[35] = {
0, 50, 15, 100, 80, 40, 60, 1, 10, 150, 30, 60, 8, 50,
100, 15, 30, 15, 200, 80, 250, 150, 400, 100, 40, 120,
@@ -1617,6 +1634,8 @@ const char *const SOME_CHARS_MAY_DIE = "Some Chars may die. Rest anyway?";
const char *const CANT_DISMISS_LAST_CHAR = "You cannot dismiss your last character!";
+const char *const DELETE_CHAR_WITH_ELDER_WEAPON = "\v000\t000This character has an Elder Weapon and cannot be deleted!";
+
const char *const REMOVE_DELETE[2] = { "Remove", "Delete" };
const char *const REMOVE_OR_DELETE_WHICH = "\x3l\t010\v005%s which character?";
@@ -2078,7 +2097,7 @@ void writeConstants(CCArchive &cc) {
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);
@@ -2086,6 +2105,7 @@ void writeConstants(CCArchive &cc) {
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((const int *)WEAPON_BASE_COSTS, 35);
file.syncNumbers((const int *)ARMOR_BASE_COSTS, 14);
file.syncNumbers((const int *)ACCESSORY_BASE_COSTS, 11);
@@ -2152,6 +2172,7 @@ void writeConstants(CCArchive &cc) {
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/devtools/create_xeen/create_xeen.cpp b/devtools/create_xeen/create_xeen.cpp
index 5b66870..d579fc2 100644
--- a/devtools/create_xeen/create_xeen.cpp
+++ b/devtools/create_xeen/create_xeen.cpp
@@ -35,6 +35,7 @@
#include "cc.h"
#include "file.h"
#include "clouds.h"
+#include "swords.h"
#include "constants.h"
#include "map.h"
@@ -54,7 +55,12 @@ void writeVersion(CCArchive &cc) {
}
int main(int argc, char *argv[]) {
- if (!outputFile.open(argc == 1 ? "xeen.ccs" : argv[1], Common::kFileWriteMode)) {
+ if (argc != 3) {
+ printf("Format: %s dark.cc \"swords xeen.dat\"\n", argv[0]);
+ exit(0);
+ }
+
+ if (!outputFile.open("xeen.ccs", Common::kFileWriteMode)) {
error("Could not open input file");
}
@@ -63,9 +69,12 @@ int main(int argc, char *argv[]) {
writeConstants(cc);
writeMap(cc);
- const char *darkName = argc > 2 ? argv[2] : "dark.cc";
+ const char *darkName = argv[1];
writeCloudsData(cc, darkName);
+ const char *swordsDatName = argv[2];
+ writeSwordsData(cc, swordsDatName);
+
cc.close();
return 0;
}
diff --git a/devtools/create_xeen/module.mk b/devtools/create_xeen/module.mk
index 29f2f30..eabd739 100644
--- a/devtools/create_xeen/module.mk
+++ b/devtools/create_xeen/module.mk
@@ -8,7 +8,8 @@ MODULE_OBJS := \
hashmap.o \
map.o \
memorypool.o \
- str.o
+ str.o \
+ swords.o
# Set the name of the executable
TOOL_EXECUTABLE := create_xeen
diff --git a/devtools/create_xeen/swords.cpp b/devtools/create_xeen/swords.cpp
new file mode 100644
index 0000000..838bfc8
--- /dev/null
+++ b/devtools/create_xeen/swords.cpp
@@ -0,0 +1,53 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+ // Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+// HACK to allow building with the SDL backend on MinGW
+// see bug #1800764 "TOOLS: MinGW tools building broken"
+#ifdef main
+#undef main
+#endif // main
+
+#include "file.h"
+#include "swords.h"
+
+#define MONSTERS_COUNT 150
+
+void writeSwordsData(CCArchive &cc, const char *swordsDatName) {
+ Common::File f;
+ Common::MemFile monsters;
+ byte buffer[MONSTERS_COUNT * 60];
+
+ if (!f.open(swordsDatName, Common::kFileReadMode))
+ error("Could not open Swords xeen.dat");
+
+ f.seek(0x44200);
+ f.read(buffer, MONSTERS_COUNT * 60);
+
+ if (strcmp((const char *)buffer + 0x33, "Slime"))
+ error("Invalid Swords xeen.dat");
+
+ monsters.write(buffer, MONSTERS_COUNT * 60);
+ cc.add("monsters.swd", monsters);
+}
diff --git a/devtools/create_xeen/swords.h b/devtools/create_xeen/swords.h
new file mode 100644
index 0000000..105b30b
--- /dev/null
+++ b/devtools/create_xeen/swords.h
@@ -0,0 +1,31 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SWORDS_H
+#define SWORDS_H
+
+#include "common/scummsys.h"
+#include "cc.h"
+
+extern void writeSwordsData(CCArchive &cc, const char *swordsDatName);
+
+#endif
diff --git a/dists/engine-data/xeen.ccs b/dists/engine-data/xeen.ccs
index 767b7ed..124b45d 100644
Binary files a/dists/engine-data/xeen.ccs and b/dists/engine-data/xeen.ccs differ
diff --git a/engines/xeen/debugger.cpp b/engines/xeen/debugger.cpp
index 4fbef4f..fed0307 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 ca17ba0..06c1592 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 e239201..df75459 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 782dc3b..d47bc4d 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;
More information about the Scummvm-git-logs
mailing list