[Scummvm-cvs-logs] scummvm master -> 1cb764b08629c2171314a88c491f8fc461202cc6

dreammaster dreammaster at scummvm.org
Sat Mar 7 02:21:48 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1cb764b086 MADS: Fix crash after installing cards in ship


Commit: 1cb764b08629c2171314a88c491f8fc461202cc6
    https://github.com/scummvm/scummvm/commit/1cb764b08629c2171314a88c491f8fc461202cc6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-06T20:20:25-05:00

Commit Message:
MADS: Fix crash after installing cards in ship

Changed paths:
    engines/mads/nebular/nebular_scenes8.cpp



diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index a0bfa06..75b6b17 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -1218,6 +1218,8 @@ void Scene805::enter() {
 }
 
 void Scene805::step() {
+	UserInterface &userInterface = _vm->_game->_scene._userInterface;
+
 	if (_game._trigger == 70) {
 		_scene->_hotspots.activate(OBJ_SHIELD_MODULATOR, false);
 		_globals._sequenceIndexes[1] = _scene->_sequences.startCycle(_globals._spriteIndexes[1], false, 25);
@@ -1225,6 +1227,7 @@ void Scene805::step() {
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_DUMMY);
 		_globals[kShieldModInstalled] = true;
 		_game._objects.setRoom(OBJ_SHIELD_MODULATOR, NOWHERE);
+		userInterface._selectedInvIndex = -1;
 		_game._player._stepEnabled = true;
 		_vm->_sound->command(24);
 	}
@@ -1236,6 +1239,7 @@ void Scene805::step() {
 		_scene->_dynamicHotspots.setPosition(idx, Common::Point(0, 0), FACING_DUMMY);
 		_globals[kTargetModInstalled] = true;
 		_game._objects.setRoom(OBJ_TARGET_MODULE, NOWHERE);
+		userInterface._selectedInvIndex = -1;
 		_game._player._stepEnabled = true;
 		_vm->_sound->command(24);
 	}






More information about the Scummvm-git-logs mailing list