[Scummvm-git-logs] scummvm master -> 0ffbce5bb13738c58b69ea55a83c24cc973c2a6e

[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:
0ffbce5bb1 XEEN: Fix rendering of town messages


Commit: 0ffbce5bb13738c58b69ea55a83c24cc973c2a6e
    https://github.com/scummvm/scummvm/commit/0ffbce5bb13738c58b69ea55a83c24cc973c2a6e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-10T12:23:29-05:00

Commit Message:
XEEN: Fix rendering of town messages

Changed paths:
    engines/xeen/town.cpp


diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp
index 13a631a..097b1c3 100644
--- a/engines/xeen/town.cpp
+++ b/engines/xeen/town.cpp
@@ -1193,6 +1193,9 @@ bool TownMessage::execute(int portrait, const Common::String &name, const Common
 		int confirm) {
 	EventsManager &events = *_vm->_events;
 	Interface &intf = *_vm->_interface;
+	Map &map = *_vm->_map;
+	Party &party = *_vm->_party;
+	Resources &res = *_vm->_resources;
 	Screen &screen = *_vm->_screen;
 	Town &town = *_vm->_town;
 	Window &w = screen._windows[11];
@@ -1205,7 +1208,8 @@ bool TownMessage::execute(int portrait, const Common::String &name, const Common
 	if (!confirm)
 		loadButtons();
 
-	if (town._townSprites[0].empty()) {
+	if (town._townSprites.empty()) {
+		town._townSprites.resize(2);
 		town._townSprites[0].load(Common::String::format("face%02d.fac", portrait));
 		town._townSprites[1].load("frame.fac");
 	}
@@ -1221,19 +1225,25 @@ bool TownMessage::execute(int portrait, const Common::String &name, const Common
 		const char *msgEnd = w.writeString(msg.c_str());
 		int wordCount = 0;
 
-		for (const char *msgP = msg.c_str(); msgP < msgEnd; ++msgP) {
+		const char *msgP = msg.c_str();
+		do {
 			if (*msgP == ' ')
 				++wordCount;
-		}
+		} while (msgP != msgEnd && *++msgP);
 
 		town._drawCtr2 = wordCount * 2;
 		town._townSprites[1].draw(screen, 0, Common::Point(16, 16));
 		town._townSprites[0].draw(screen, town._drawFrameIndex, Common::Point(23, 22));
 		w.update();
 
-		if (!msgEnd) {
-			// Doesn't look like the code here in original can ever be reached
-			assert(0);
+		if (!msgEnd && !confirm) {
+			res._globalSprites.draw(screen, 7, Common::Point(232, 74));
+			res._globalSprites.draw(screen, 0, Common::Point(235, 75));
+			res._globalSprites.draw(screen, 2, Common::Point(260, 75));
+			screen._windows[34].update();
+
+			intf._face1State = map._headData[party._mazePosition.y][party._mazePosition.x]._left;
+			intf._face2State = map._headData[party._mazePosition.y][party._mazePosition.x]._right;
 		}
 
 		if (confirm == 2) {