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

dreammaster dreammaster at scummvm.org
Thu Jan 18 00:05:31 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:
e20a463165 XEEN: Fix display of text in bottom screen dialogs


Commit: e20a46316588c161d7bd0d92c39e93e4339bc567
    https://github.com/scummvm/scummvm/commit/e20a46316588c161d7bd0d92c39e93e4339bc567
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-17T18:05:24-05:00

Commit Message:
XEEN: Fix display of text in bottom screen dialogs

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 46485a5..e597cf7 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1840,10 +1840,17 @@ void Scripts::display(bool justifyFlag, int var46) {
 		w.open();
 
 	while (!_vm->shouldQuit()) {
-		_displayMessage = w.writeString(_displayMessage);
+		const char *newPos = w.writeString(_displayMessage);
 		w.update();
+
+		// Check for end of message
+		if (!newPos)
+			break;
+		_displayMessage = Common::String(newPos);
 		if (_displayMessage.empty())
 			break;
+
+		// Wait for click
 		events.clearEvents();
 
 		do {





More information about the Scummvm-git-logs mailing list