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

[bluegr]

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

Summary:
ff3cc3bc0f MADS: Remove resolved FIXME in scene 307
d9d173c75e MADS: Add another friendly name for a noun in scene 103
312139b86f MADS: Remove superfluous parentheses
d36155247f MADS: Fix teleporter animation in scene 201 (meteorologist station)


Commit: ff3cc3bc0f9d12bd91fcd6e243d15f6a751a961f
    https://github.com/scummvm/scummvm/commit/ff3cc3bc0f9d12bd91fcd6e243d15f6a751a961f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-05-30T03:11:20+03:00

Commit Message:
MADS: Remove resolved FIXME in scene 307

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



diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 6a6b36f..a963484 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -869,8 +869,7 @@ void Scene307::step() {
 		}
 		_lastFrameTime = _scene->_frameStartTime;
 
-		// FIXME: The active animation is never a zero pointer, so the guards never show up
-		if ((_guardTime > 3000) && !_duringPeeingFl /*&& (_scene->_activeAnimation == nullptr)*/
+		if ((_guardTime > 3000) && !_duringPeeingFl && (_scene->_activeAnimation == nullptr)
 		&& (_game._screenObjects._inputMode != 1) && _globals[kMetBuddyBeast] && !_activePrisonerFl) {
 			if (!_game._objects.isInInventory(OBJ_SCALPEL) && !_grateOpenedFl) {
 				_game._player._stepEnabled = false;


Commit: d9d173c75e354abd6e43610d1b47570eb9609c67
    https://github.com/scummvm/scummvm/commit/d9d173c75e354abd6e43610d1b47570eb9609c67
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-05-30T03:11:20+03:00

Commit Message:
MADS: Add another friendly name for a noun in scene 103

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



diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index b34fae4..8cf4107 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -1433,7 +1433,7 @@ void Scene103::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(VERB_TAKE, 371) && _game._objects.isInRoom(OBJ_TIMER_MODULE)) {
+	} else if (_action.isAction(VERB_TAKE, NOUN_TIMER_MODULE) && _game._objects.isInRoom(OBJ_TIMER_MODULE)) {
 		switch (_vm->_game->_trigger) {
 		case 0:
 			_scene->changeVariant(1);


Commit: 312139b86f2aea59ae89f2ce5dac75239425291e
    https://github.com/scummvm/scummvm/commit/312139b86f2aea59ae89f2ce5dac75239425291e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-05-30T03:11:20+03:00

Commit Message:
MADS: Remove superfluous parentheses

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



diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 7a9738f..9b0b8e8 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -292,7 +292,7 @@ void Scene201::actions() {
 	if (_action._lookFlag == false) {
 		if (_action.isAction(VERB_WALK_TOWARDS, NOUN_FIELD_TO_SOUTH))
 			_scene->_nextSceneId = 202;
-		else if ((_action.isAction(VERB_CLIMB_UP, NOUN_STEPS)) || (_action.isAction(VERB_WALK_INSIDE, NOUN_TELEPORTER)) || (_action.isAction(VERB_WALK_INSIDE, NOUN_STRANGE_DEVICE))) {
+		else if (_action.isAction(VERB_CLIMB_UP, NOUN_STEPS) || (_action.isAction(VERB_WALK_INSIDE, NOUN_TELEPORTER)) || (_action.isAction(VERB_WALK_INSIDE, NOUN_STRANGE_DEVICE))) {
 			if (_game._trigger == 0) {
 				_game._player._stepEnabled = false;
 				_game._player._visible = false;
@@ -844,7 +844,7 @@ void Scene202::actions() {
 		}
 
 		_action._inProgress = false;
-	} else if ((_action.isAction(VERB_CLIMB_UP, NOUN_LADDER)) && !_globals[kLadderBroken]) {
+	} else if (_action.isAction(VERB_CLIMB_UP, NOUN_LADDER) && !_globals[kLadderBroken]) {
 		switch (_game._trigger) {
 		case 0:
 			_vm->_sound->command(29);
@@ -873,7 +873,7 @@ void Scene202::actions() {
 			_action._inProgress = false;
 			return;
 		}
-	} else if (((_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_FIELD_TO_NORTH)) || (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_STRANGE_DEVICE))) && (_globals[kSexOfRex] == SEX_MALE)) {
+	} else if ((_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_FIELD_TO_NORTH) || (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_STRANGE_DEVICE))) && (_globals[kSexOfRex] == SEX_MALE)) {
 		if (!_ladderTopFl) {
 			switch (_game._trigger) {
 			case 0:
@@ -1584,7 +1584,7 @@ void Scene207::preActions() {
 	if (_action.isAction(VERB_WALK_TOWARDS, NOUN_OPEN_FIELD_TO_EAST))
 		_game._player._walkOffScreenSceneId = 208;
 
-	if ((_action.isAction(VERB_WALKTO)) || (_action.isAction(VERB_LOOK))) {
+	if (_action.isAction(VERB_WALKTO) || _action.isAction(VERB_LOOK)) {
 		if (_action.isObject(NOUN_VULTURE)) {
 			_vultureTime = -9999;
 		} else if (_action.isObject(NOUN_SPIDER)) {
@@ -3296,7 +3296,7 @@ void Scene209::actions() {
 		return;
 	}
 
-	if ((_action.isAction(VERB_TALKTO, NOUN_MONKEY)) && !_pitchFl && !_playingDialogFl) {
+	if (_action.isAction(VERB_TALKTO, NOUN_MONKEY) && !_pitchFl && !_playingDialogFl) {
 		_scene->_sequences.addTimer(1, _dialogAbortVal);
 		_playingDialogFl = true;
 		_game._player._stepEnabled = false;


Commit: d36155247f37de6fdc07dbe59c395c3b1c2d2d2c
    https://github.com/scummvm/scummvm/commit/d36155247f37de6fdc07dbe59c395c3b1c2d2d2c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-05-30T03:11:21+03:00

Commit Message:
MADS: Fix teleporter animation in scene 201 (meteorologist station)

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



diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 9b0b8e8..36e7107 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -162,7 +162,7 @@ void Scene201::enter() {
 	if (_globals[kTeleporterCommand]) {
 		_game._player._visible = false;
 		_game._player._stepEnabled = false;
-		int sepChar = (_globals[kSexOfRex] == SEX_UNKNOWN) ? 't' : 'u';
+		int sepChar = (_globals[kSexOfRex] == SEX_MALE) ? 't' : 'u';
 		// Guess values. What is the default value used by the compiler?
 		int suffixNum = -1;
 		int abortTimers = -1;