[Scummvm-git-logs] scummvm master -> 140f575c70273d69bc1c31c3e0c5641c8982dce7

dreammaster dreammaster at scummvm.org
Sun Dec 10 19:47:11 CET 2017


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:
140f575c70 XEEN: Fix several malformed string constants


Commit: 140f575c70273d69bc1c31c3e0c5641c8982dce7
    https://github.com/scummvm/scummvm/commit/140f575c70273d69bc1c31c3e0c5641c8982dce7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-12-10T13:46:58-05:00

Commit Message:
XEEN: Fix several malformed string constants

Changed paths:
    engines/xeen/dialogs_items.cpp
    engines/xeen/scripts.cpp
    engines/xeen/town.cpp


diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp
index 867bc7d..9f08e8b 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs_items.cpp
@@ -1051,7 +1051,7 @@ void ItemsDialog::itemToGold(Character &c, int itemIndex, ItemCategory category,
 
 	if (category == CATEGORY_WEAPON && item._id == 34) {
 		sound.playFX(21);
-		ErrorScroll::show(_vm, Common::String::format("\v012\t000\x03c%s",
+		ErrorScroll::show(_vm, Common::String::format("\v012\t000\x03""c%s",
 			Res.SPELL_FAILED));
 	} else if (item._id != 0) {
 		// There is a valid item present
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 3036280..d64141a 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1307,7 +1307,7 @@ bool Scripts::cmdDisplayBottomTwoLines(ParamsIterator &params) {
 	params.readByte();
 	int textId = params.readByte();
 
-	Common::String msg = Common::String::format("\r\x03c\t000\v007%s\n\n%s",
+	Common::String msg = Common::String::format("\r\x03""c\t000\v007%s\n\n%s",
 		"",
 		map._events._text[textId].c_str());
 	w.close();
diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp
index c262281..069ff8f 100644
--- a/engines/xeen/town.cpp
+++ b/engines/xeen/town.cpp
@@ -1295,7 +1295,7 @@ bool TownMessage::execute(int portrait, const Common::String &name, const Common
 	int result = -1;
 	Common::String msgText = text;
 	do {
-		Common::String msg = Common::String::format("\r\v014\x03c\t125%s\t000\v054%s",
+		Common::String msg = Common::String::format("\r\v014\x03""c\t125%s\t000\v054%s",
 			name.c_str(), msgText.c_str());
 
 		// Count the number of words





More information about the Scummvm-git-logs mailing list