diff options
| author | Paul Gilbert | 2019-10-31 20:15:54 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-10-31 20:16:31 -0700 |
| commit | 537515e808409d81493e390d6fb2098b0554a271 (patch) | |
| tree | f9a29e6e3c83e050b4d4bc6c7a9ccf61f164efcb /engines | |
| parent | 53db8dc5ff8d7276d635bc12766f494e7b7a9030 (diff) | |
| download | scummvm-rg350-537515e808409d81493e390d6fb2098b0554a271.tar.gz scummvm-rg350-537515e808409d81493e390d6fb2098b0554a271.tar.bz2 scummvm-rg350-537515e808409d81493e390d6fb2098b0554a271.zip | |
XEEN: Proper fix for incorrect %lu format specifiers
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/dialogs/dialogs_char_info.cpp | 8 | ||||
| -rw-r--r-- | engines/xeen/files.cpp | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/engines/xeen/dialogs/dialogs_char_info.cpp b/engines/xeen/dialogs/dialogs_char_info.cpp index 68374da080..3923caf172 100644 --- a/engines/xeen/dialogs/dialogs_char_info.cpp +++ b/engines/xeen/dialogs/dialogs_char_info.cpp @@ -289,13 +289,7 @@ Common::String CharacterInfo::loadCharacterDetails(const Character &c) { c._energyResistence._permanent + c.itemScan(15) + c._energyResistence._temporary + c._magicResistence._permanent + c.itemScan(16) + c._magicResistence._temporary; - // WORKAROUND: xeen.ccs format string has %lu for gold, gems, and experience - Common::String charDetails = Res.CHARACTER_DETAILS; - const char *p; - while ((p = strstr(charDetails.c_str(), "%lu")) != nullptr) - charDetails.deleteChar(p - charDetails.c_str() + 1); - - return Common::String::format(charDetails.c_str(), + return Common::String::format(Res.CHARACTER_DETAILS, Res.PARTY_GOLD, c._name.c_str(), Res.SEX_NAMES[c._sex], Res.RACE_NAMES[c._race], Res.CLASS_NAMES[c._class], c.statColor(c.getStat(MIGHT), c.getStat(MIGHT, true)), c.getStat(MIGHT), diff --git a/engines/xeen/files.cpp b/engines/xeen/files.cpp index 297dfc0156..080246f3dd 100644 --- a/engines/xeen/files.cpp +++ b/engines/xeen/files.cpp @@ -261,7 +261,7 @@ bool FileManager::setup() { // Verify the version of the CC is correct CCArchive *dataCc = new CCArchive("xeen.ccs", "data", true); - if (!f.open("VERSION", *dataCc) || f.readUint32LE() != 2) { + if (!f.open("VERSION", *dataCc) || f.readUint32LE() != 3) { GUIErrorMessage("xeen.ccs is out of date"); return false; } |