diff options
| author | Strangerke | 2013-02-03 14:20:39 +0100 |
|---|---|---|
| committer | Strangerke | 2013-02-03 14:20:39 +0100 |
| commit | 5be9c19ac75476be2117c14e0795c96d12c481ea (patch) | |
| tree | 873470f86076dab6fe7df83bb4614f364cfdbef3 /engines | |
| parent | 6a477576b91fc88fb2676c0019dc98bd724e81ed (diff) | |
| download | scummvm-rg350-5be9c19ac75476be2117c14e0795c96d12c481ea.tar.gz scummvm-rg350-5be9c19ac75476be2117c14e0795c96d12c481ea.tar.bz2 scummvm-rg350-5be9c19ac75476be2117c14e0795c96d12c481ea.zip | |
HOPKINS: flatten a leftover serie of IFs
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/hopkins/hopkins.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
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); |