[Scummvm-git-logs] scummvm branch-2-1 -> 6d7a17c9ef72414a601593abd7ba2dc959bd2a56

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6d7a17c9ef XEEN: Fix for invalid numbers in Character Info dialog


Commit: 6d7a17c9ef72414a601593abd7ba2dc959bd2a56
    https://github.com/scummvm/scummvm/commit/6d7a17c9ef72414a601593abd7ba2dc959bd2a56
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-10-30T20:35:10-07:00

Commit Message:
XEEN: Fix for invalid numbers in Character Info dialog

Changed paths:
    engines/xeen/dialogs/dialogs_char_info.cpp


diff --git a/engines/xeen/dialogs/dialogs_char_info.cpp b/engines/xeen/dialogs/dialogs_char_info.cpp
index 3923caf..68374da 100644
--- a/engines/xeen/dialogs/dialogs_char_info.cpp
+++ b/engines/xeen/dialogs/dialogs_char_info.cpp
@@ -289,7 +289,13 @@ 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;
 
-	return Common::String::format(Res.CHARACTER_DETAILS,
+	// 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(),
 		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),