[Scummvm-git-logs] scummvm master -> e2a64931d261414e2ee9cca482e5f7678eda92ac

[dreammaster]

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

Summary:
2c5237db7e XEEN: Parameter to cmdDisplayLarge is line number, not offset
e2a64931d2 XEEN: Fix text for Dungeon of Death statue


Commit: 2c5237db7e0d4f2fd887ec8dd65e881fedeacb7d
    https://github.com/scummvm/scummvm/commit/2c5237db7e0d4f2fd887ec8dd65e881fedeacb7d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-28T20:07:32-07:00

Commit Message:
XEEN: Parameter to cmdDisplayLarge is line number, not offset

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 9e04fd1..be56723 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1374,7 +1374,7 @@ bool Scripts::cmdDisplayBottomTwoLines(ParamsIterator &params) {
 bool Scripts::cmdDisplayLarge(ParamsIterator &params) {
 	Party &party = *g_vm->_party;
 	Common::String filename = Common::String::format("aaze2%03u.txt", party._mazeId);
-	uint offset = params.readByte();
+	uint lineNumber = params.readByte();
 
 	// Get the text data for the current maze
 	File f(filename);
@@ -1382,8 +1382,11 @@ bool Scripts::cmdDisplayLarge(ParamsIterator &params) {
 	f.read(data, f.size());
 	f.close();
 
-	// Get the message at the specified offset
-	_message = Common::String(data + offset);
+	// Get the message at the specified line
+	const char *lineP = data;
+	for (uint idx = 0; idx < lineNumber; ++idx, lineP += strlen(lineP) + 1) {}
+
+	_message = Common::String(lineP);
 	delete[] data;
 
 	// Display the message


Commit: e2a64931d261414e2ee9cca482e5f7678eda92ac
    https://github.com/scummvm/scummvm/commit/e2a64931d261414e2ee9cca482e5f7678eda92ac
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-28T20:07:32-07:00

Commit Message:
XEEN: Fix text for Dungeon of Death statue

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index be56723..81af063 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1926,6 +1926,8 @@ void Scripts::display(bool justifyFlag, int var46) {
 
 	if (!justifyFlag)
 		_displayMessage = Common::String::format("\r\x3""c%s", _message.c_str());
+	else
+		_displayMessage = _message;
 
 	if (!w._enabled)
 		w.open();