[Scummvm-git-logs] scummvm master -> 618d256a92c881d580efe27f68febfa7a9471273

[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:
618d256a92 XEEN: Fix regression stopping map dialog frame from rendering


Commit: 618d256a92c881d580efe27f68febfa7a9471273
    https://github.com/scummvm/scummvm/commit/618d256a92c881d580efe27f68febfa7a9471273
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-12-10T18:03:28-05:00

Commit Message:
XEEN: Fix regression stopping map dialog frame from rendering

Changed paths:
    engines/xeen/dialogs_map.cpp
    engines/xeen/interface.cpp
    engines/xeen/interface.h


diff --git a/engines/xeen/dialogs_map.cpp b/engines/xeen/dialogs_map.cpp
index 7c7e6f7..f47f1b6 100644
--- a/engines/xeen/dialogs_map.cpp
+++ b/engines/xeen/dialogs_map.cpp
@@ -81,7 +81,7 @@ void MapDialog::execute() {
 	events.updateGameCounter();
 	do {
 		if (drawFlag)
-			intf.draw3d(false);
+			intf.draw3d(false, false);
 		windows[5].writeString("\r");
 
 		if (map._isOutdoors)
@@ -109,7 +109,7 @@ void MapDialog::execute() {
 		windows[5].update();
 		windows[3].update();
 
-		events.pollEvents();
+		events.ipause5(2);
 		drawFlag = false;
 	} while (!_vm->shouldQuit() && !events.isKeyMousePressed());
 
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index f39c2d4..5bbc6ab 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -1242,7 +1242,7 @@ void Interface::bash(const Common::Point &pt, Direction direction) {
 	drawParty(true);
 }
 
-void Interface::draw3d(bool updateFlag) {
+void Interface::draw3d(bool updateFlag, bool pauseFlag) {
 	Combat &combat = *_vm->_combat;
 	EventsManager &events = *_vm->_events;
 	Party &party = *_vm->_party;
@@ -1299,7 +1299,8 @@ void Interface::draw3d(bool updateFlag) {
 	}
 
 	party._stepped = false;
-	events.ipause5(2);
+	if (pauseFlag)
+		events.ipause5(2);
 }
 
 void Interface::handleFalling() {
diff --git a/engines/xeen/interface.h b/engines/xeen/interface.h
index 54a9cd1..48d75ab 100644
--- a/engines/xeen/interface.h
+++ b/engines/xeen/interface.h
@@ -168,8 +168,10 @@ public:
 
 	/**
 	 * Handles drawing the elements of the interface and game scene
+	 * @param updateFlag		Updates UI windows 1 & 3
+	 * @param pauseFlag			Does a brief pause at the end of drawing
 	 */
-	void draw3d(bool updateFlag);
+	void draw3d(bool updateFlag, bool pauseFlag = true);
 
 	/**
 	 * Draw the display borders