From 5be9c19ac75476be2117c14e0795c96d12c481ea Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 3 Feb 2013 14:20:39 +0100
Subject: HOPKINS: flatten a leftover serie of IFs

---
 engines/hopkins/hopkins.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 9974f7a2c6..216d8787cc 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -816,6 +816,8 @@ bool HopkinsEngine::runFull() {
 	
 	_globals._exitId = 0;
 
+	_globals._exitId = 77;
+
 	for (;;) {
 		if (_globals._exitId == 300)
 			_globals._exitId = 0;
@@ -2694,12 +2696,9 @@ void HopkinsEngine::BTOCEAN() {
 				_objectsManager.setSpriteX(0, oldX);
 				OCEAN_HOME();
 				_eventsManager.VBL();
-				if (_eventsManager.getMouseButton() == 1) {
-					if (oldPosX == _eventsManager.getMouseX()) {
-						if (_eventsManager.getMouseY() == oldPosY)
-							break;
-					}
-				}
+				if (_eventsManager.getMouseButton() == 1 && oldPosX == _eventsManager.getMouseX() && _eventsManager.getMouseY() == oldPosY)
+					break;
+
 				if (oldX <= 236) {
 					if (!displAnim)
 						_objectsManager.SPACTION(_globals.PERSO, "18,17,16,15,14,13,12,11,10,9,-1,", 0, 0, 6, false);
-- 
cgit v1.2.3