[Scummvm-cvs-logs] scummvm master -> bebfb0df450dd76f1ab6b5f828f6a418123d093f

[Strangerke]

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

Summary:
92b63ca70a MADS: Phantom: reduce the scope of a variable
bebfb0df45 MADS: Rex: Remove dead code in doObjectAction


Commit: 92b63ca70a0367f1b5d900dc628861d3df77a158
    https://github.com/scummvm/scummvm/commit/92b63ca70a0367f1b5d900dc628861d3df77a158
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-23T01:07:28+01:00

Commit Message:
MADS: Phantom: reduce the scope of a variable

Changed paths:
    engines/mads/phantom/phantom_scenes5.cpp



diff --git a/engines/mads/phantom/phantom_scenes5.cpp b/engines/mads/phantom/phantom_scenes5.cpp
index 508f2b9..2daaed9 100644
--- a/engines/mads/phantom/phantom_scenes5.cpp
+++ b/engines/mads/phantom/phantom_scenes5.cpp
@@ -1495,8 +1495,6 @@ void Scene502::getPanelInfo(Common::Point *walkToPos, int *panel, Common::Point
 }
 
 void Scene502::handlePanelAnimation() {
-	int puzzleSolvedFl = true;
-
 	switch (_game._trigger) {
 	case 110:
 		_vm->_sound->command(65);
@@ -1748,6 +1746,7 @@ void Scene502::handlePanelAnimation() {
 			break;
 		}
 
+		int puzzleSolvedFl = true;
 		for (int i = 0; i < 16; i++) {
 			if (_puzzlePictures[i] != 1)
 				puzzleSolvedFl = false;


Commit: bebfb0df450dd76f1ab6b5f828f6a418123d093f
    https://github.com/scummvm/scummvm/commit/bebfb0df450dd76f1ab6b5f828f6a418123d093f
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-23T01:08:39+01:00

Commit Message:
MADS: Rex: Remove dead code in doObjectAction

(same check earlier in the same if statement)

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



diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 5526845..c4b7f57 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -693,8 +693,6 @@ void GameNebular::doObjectAction() {
 			_globals[kHandsetCellStatus] = _difficulty != DIFFICULTY_HARD || _globals[kHandsetCellStatus] ? 1 : 2;
 			dialogs.show(425);
 		}
-	} else if (action.isAction(VERB_SET, NOUN_TIMEBOMB)) {
-		dialogs.show(427);
 	} else if (action.isAction(VERB_PUT, NOUN_BOMB, NOUN_CHICKEN) || action.isAction(VERB_PUT, NOUN_BOMBS, NOUN_CHICKEN)) {
 		_objects.setRoom(OBJ_CHICKEN, NOWHERE);
 		if (_objects.isInInventory(OBJ_BOMBS)) {