From ef90135bb96f43b01ae8d6a8c57b901c56f23872 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 28 Nov 2012 20:49:26 +1100
Subject: HOPKINS: Bugfix for exiting game when the map screen is being shown

---
 engines/hopkins/hopkins.cpp | 3 +++
 engines/hopkins/hopkins.h   | 5 +++++
 2 files changed, 8 insertions(+)

(limited to 'engines')

diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 7e88a4fd63..ddb7e3ad95 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -2228,6 +2228,9 @@ int HopkinsEngine::PWBASE() {
 	bool loopCond = false;
 	int zone;
 	do {
+		if (shouldQuit())
+			return 0;
+
 		int mouseButton = _eventsManager.BMOUSE();
 		int posX = _eventsManager.XMOUSE();
 		int posY = _eventsManager.YMOUSE();
diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h
index bd071eda0c..5b5968a73f 100644
--- a/engines/hopkins/hopkins.h
+++ b/engines/hopkins/hopkins.h
@@ -97,7 +97,12 @@ private:
 	void BASED();
 	void JOUE_FIN();
 	void AVION();
+
+	/**
+	 * Displays the map screen in the underground base.
+	 */
 	int  PWBASE();
+
 	void BTOCEAN();
 	void OCEAN_HOME();
 	void OCEAN(int16 a1, Common::String a2, Common::String a3, int16 a4, int16 exit1, int16 exit2, int16 exit3, int16 exit4, int16 a9);
-- 
cgit v1.2.3