diff options
| author | Strangerke | 2012-11-11 20:47:08 +0100 |
|---|---|---|
| committer | Strangerke | 2012-11-11 20:47:08 +0100 |
| commit | ec012d7242c6ab54c1fd04fb269807b6c148a71a (patch) | |
| tree | 417d1c55a6e873494402de532133eec51f834e34 | |
| parent | 29d54519156912a8692f88e4e3bf802718465d02 (diff) | |
| download | scummvm-rg350-ec012d7242c6ab54c1fd04fb269807b6c148a71a.tar.gz scummvm-rg350-ec012d7242c6ab54c1fd04fb269807b6c148a71a.tar.bz2 scummvm-rg350-ec012d7242c6ab54c1fd04fb269807b6c148a71a.zip | |
HOPKINS: Rework a bit BASE() code
| -rw-r--r-- | engines/hopkins/hopkins.cpp | 115 |
1 files changed, 48 insertions, 67 deletions
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index 5fd8164bf8..cd6ee1d5bd 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -1939,79 +1939,60 @@ void HopkinsEngine::BASE() { _soundManager.WSOUND(25); if (_globals.SVGA == 1) { _animationManager.PLAY_ANM("base00.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("base05.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("base10.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("base20.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("base30.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("base40.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("base50.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("OC00.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("OC05.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("OC10.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _animationManager.PLAY_ANM("OC20.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) - goto LABEL_27; - _graphicsManager.FADE_LINUX = 2; - _animationManager.PLAY_ANM("OC30.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base05.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base10.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base20.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base30.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base40.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base50.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("OC00.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("OC05.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("OC10.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("OC20.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) { + _graphicsManager.FADE_LINUX = 2; + _animationManager.PLAY_ANM("OC30.anm", 10, 18, 18); + } } if (_globals.SVGA == 2) { _animationManager.PLAY_ANM("base00a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { + if (!_eventsManager.ESC_KEY) _animationManager.PLAY_ANM("base05a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("base10a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("base20a.anm", 10, 18, 18); - if (_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("base30a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("base40a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("base50a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("OC00a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("OC05a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("OC10a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _animationManager.PLAY_ANM("OC20a.anm", 10, 18, 18); - if (!_eventsManager.ESC_KEY) { - _graphicsManager.FADE_LINUX = 2; - _animationManager.PLAY_ANM("OC30a.anm", 10, 18, 18); - } - } - } - } - } - } - } - } - } - } + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base10a.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base20a.anm", 10, 18, 18); + // CHECKME: The original code was doing the opposite test, which looks like a bug. + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base30a.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base40a.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("base50a.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("OC00a.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("OC05a.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("OC10a.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) + _animationManager.PLAY_ANM("OC20a.anm", 10, 18, 18); + if (!_eventsManager.ESC_KEY) { + _graphicsManager.FADE_LINUX = 2; + _animationManager.PLAY_ANM("OC30a.anm", 10, 18, 18); } } -LABEL_27: + _eventsManager.ESC_KEY = false; _animationManager.CLS_ANM = false; _globals.SORTIE = 85; |