diff options
| author | Strangerke | 2013-02-03 10:04:03 +0100 | 
|---|---|---|
| committer | Strangerke | 2013-02-03 10:04:03 +0100 | 
| commit | f90da4dd7e93801cc74f3c084c8bd8db2a8efecf (patch) | |
| tree | 8164f097941e0530be945e4ef93cdf67cd6ec9ee | |
| parent | aa4f39e6666c6c49df76a926d80a6e2420cfffd4 (diff) | |
| download | scummvm-rg350-f90da4dd7e93801cc74f3c084c8bd8db2a8efecf.tar.gz scummvm-rg350-f90da4dd7e93801cc74f3c084c8bd8db2a8efecf.tar.bz2 scummvm-rg350-f90da4dd7e93801cc74f3c084c8bd8db2a8efecf.zip | |
HOPKINS: Get rid of another couple of GOTOs in playAnim2
| -rw-r--r-- | engines/hopkins/anim.cpp | 20 | 
1 files changed, 10 insertions, 10 deletions
| diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index 529c4e6f34..34442f848c 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -352,9 +352,15 @@ LABEL_48:  		if (v5)  			goto LABEL_88;  		f.read(screenP, READ_LE_UINT32(ptr + 8)); -		if (_vm->_globals.iRegul == 1) -			break; -LABEL_77: +		if (_vm->_globals.iRegul == 1) { +			while (!_vm->_eventsManager._escKeyFl) { +				_vm->_eventsManager.refreshEvents(); +				_vm->_soundManager.checkSoundEnd(); +				if (_vm->_eventsManager._rateCounter >= rate2) +					break; +			} +		} +  		_vm->_eventsManager._rateCounter = 0;  		_vm->_graphicsManager.lockScreen();  		if (hasScreenCopy) { @@ -375,18 +381,12 @@ LABEL_88:  					_vm->_eventsManager.refreshEvents();  					_vm->_soundManager.checkSoundEnd();  					if (_vm->_eventsManager._rateCounter >= rate3) -						goto LABEL_114; +						break;  				}  			}  			goto LABEL_114;  		}  	} -	while (!_vm->_eventsManager._escKeyFl) { -		_vm->_eventsManager.refreshEvents(); -		_vm->_soundManager.checkSoundEnd(); -		if (_vm->_eventsManager._rateCounter >= rate2) -			goto LABEL_77; -	}  LABEL_114:  	_vm->_graphicsManager._skipVideoLockFl = false;  	f.close(); | 
