From 9b6749cab8908b45a9c7176faa5d142b72bcde0b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 25 Feb 2015 20:25:27 -0500
Subject: XEEN: Fix display of combat action buttons

---
 engines/xeen/interface.cpp | 10 +++-------
 engines/xeen/interface.h   |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 611eccb843..47db309668 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -1223,7 +1223,7 @@ void Interface::bash(const Common::Point &pt, Direction direction) {
 	drawParty(true);
 }
 
-void Interface::draw3d(bool updateFlag) {
+void Interface::draw3d(bool updateFlag, bool skipDelay) {
 	Combat &combat = *_vm->_combat;
 	EventsManager &events = *_vm->_events;
 	Party &party = *_vm->_party;
@@ -1282,11 +1282,7 @@ void Interface::draw3d(bool updateFlag) {
 		// TODO: Save current scripts data?
 	}
 
-	// TODO: Check use of updateFlag here. Original doesn't have it, but I
-	// wanted to ensure in places like the AutoMapDialog, that the draw3d
-	// doesn't result in the screen updating until the dialog has had
-	// a chance to full render itself
-	if (updateFlag)
+	if (!skipDelay)
 		events.wait(2);
 }
 
@@ -1871,7 +1867,7 @@ void Interface::doCombat() {
 
 	_iconSprites.load("combat.icn");
 	for (int idx = 1; idx < 16; ++idx)
-		_mainList[idx]._sprites = nullptr;
+		_mainList[idx]._sprites = &_iconSprites;
 
 	// Set the combat buttons
 	setMainButtons(true);
diff --git a/engines/xeen/interface.h b/engines/xeen/interface.h
index 66a40c23cf..f5e5cc34ee 100644
--- a/engines/xeen/interface.h
+++ b/engines/xeen/interface.h
@@ -140,7 +140,7 @@ public:
 
 	void bash(const Common::Point &pt, Direction direction);
 
-	void draw3d(bool updateFlag);
+	void draw3d(bool updateFlag, bool skipDelay = false);
 
 	void assembleBorder();
 
-- 
cgit v1.2.3