[Scummvm-git-logs] scummvm master -> 1cedc605ee1f94578bf59c9f78949637f735b8d7

dreammaster dreammaster at scummvm.org
Sun Feb 25 01:02:14 CET 2018


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:
1cedc605ee XEEN: Fix format string for items dialog weapon lines


Commit: 1cedc605ee1f94578bf59c9f78949637f735b8d7
    https://github.com/scummvm/scummvm/commit/1cedc605ee1f94578bf59c9f78949637f735b8d7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-24T19:02:05-05:00

Commit Message:
XEEN: Fix format string for items dialog weapon lines

Changed paths:
    devtools/create_xeen/constants.cpp
    engines/xeen/dialogs_items.cpp


diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index 1ab1a7a..8fc5b92 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -1145,7 +1145,7 @@ const char *const ITEMS_DIALOG_TEXT1 =
 const char *const ITEMS_DIALOG_TEXT2 =
 	"\r\x2\x3""c\v021\t017\f37W\fdeap\t051\f37A\fdrmor\t085A"
 	"\f37c\fdces\t119\f37M\fdisc\t153\f37%s\t289Exit";
-const char *const ITEMS_DIALOG_LINE1 = "\x3r\f%02u\f023%2d)\x3l\t028%s\n";
+const char *const ITEMS_DIALOG_LINE1 = "\x3r\f%02u\t023%2d)\x3l\t028%s\n";
 const char *const ITEMS_DIALOG_LINE2 = "\x3r\f%02u\t023%2d)\x3l\t028%s\x3r\t000%lu\n";
 
 const char *const BTN_BUY = "\f37B\fduy";
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp
index 379efe0..bf0e40e 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs_items.cpp
@@ -52,7 +52,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 	bool updateStock = mode == ITEMMODE_BLACKSMITH;
 	int itemIndex = -1;
 	Common::StringArray lines;
-	int arr[40];
+	uint arr[40];
 	int actionIndex = -1;
 
 	events.setCursor(0);





More information about the Scummvm-git-logs mailing list