diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/access/amazon/amazon_scripts.cpp | 4 | ||||
| -rw-r--r-- | engines/access/scripts.cpp | 10 | ||||
| -rw-r--r-- | engines/access/scripts.h | 1 | 
3 files changed, 10 insertions, 5 deletions
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp index d0b13d9c58..75fbd052b0 100644 --- a/engines/access/amazon/amazon_scripts.cpp +++ b/engines/access/amazon/amazon_scripts.cpp @@ -1805,14 +1805,14 @@ void AmazonScripts::RIVER() {  			_game->_hitSafe -= 2;  		if (_game->_hitSafe < 0) { -			warning("TODO: cmdDead(RIVERDEATH[0]);"); +			cmdDead(RIVERDEATH[0]);  			return;  		}  		if (_game->_deathFlag) {  			_game->_deathCount--;  			if (_game->_deathCount == 0) { -				warning("TODO: cmdDead(RIVERDEATH[_game->_deathType]);"); +				cmdDead(RIVERDEATH[_game->_deathType]);  				return;  			}  		} diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index 9268b829e7..3f94ea2e55 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -775,14 +775,13 @@ void Scripts::cmdPlayerOn() {  	_vm->_player->_playerOff = false;  } -void Scripts::cmdDead() {  -	int deathId = _data->readByte(); +void Scripts::cmdDead(int deathId) {  	_vm->_events->hideCursor();  	_vm->_screen->forceFadeOut();  	cmdFreeSound();  	_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_files->loadFile(98, 44), 1)); -	 +  	_vm->_screen->clearScreen();  	_vm->_screen->setPanel(3); @@ -843,6 +842,11 @@ void Scripts::cmdDead() {  	}  } +void Scripts::cmdDead() {  +	int deathId = _data->readByte(); +	cmdDead(deathId); +} +  void Scripts::cmdFadeOut() {  	_vm->_screen->forceFadeOut();  } diff --git a/engines/access/scripts.h b/engines/access/scripts.h index 2b527a855a..de27ae7205 100644 --- a/engines/access/scripts.h +++ b/engines/access/scripts.h @@ -120,6 +120,7 @@ protected:  	void cmdPlayerOff();  	void cmdPlayerOn();  	void cmdDead(); +	void cmdDead(int deathId);  	void cmdFadeOut();  	void CMDENDVID();  public:  | 
