aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2012-11-28 20:49:26 +1100
committerPaul Gilbert2012-11-28 20:49:26 +1100
commitef90135bb96f43b01ae8d6a8c57b901c56f23872 (patch)
treeef8889b13ce28d6e14da414a1c7acdbf5a54a798
parent0465fa37b901c812bd2dc130afd0dfc0368e0ff3 (diff)
downloadscummvm-rg350-ef90135bb96f43b01ae8d6a8c57b901c56f23872.tar.gz
scummvm-rg350-ef90135bb96f43b01ae8d6a8c57b901c56f23872.tar.bz2
scummvm-rg350-ef90135bb96f43b01ae8d6a8c57b901c56f23872.zip
HOPKINS: Bugfix for exiting game when the map screen is being shown
-rw-r--r--engines/hopkins/hopkins.cpp3
-rw-r--r--engines/hopkins/hopkins.h5
2 files changed, 8 insertions, 0 deletions
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);