[Scummvm-cvs-logs] scummvm master -> 5e5a37e9786cedeff4159094705aa94d33cc9ec4
bluegr
bluegr at gmail.com
Sun Jun 1 07:34:44 CEST 2014
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:
0c1c83e5e6 MADS: Bugfixes for scene 352
5e5a37e978 MADS: Fix sitting on the bar stool in scene 402 (bar)
Commit: 0c1c83e5e69579669f77fc6b1ca80d58f2c57b1a
https://github.com/scummvm/scummvm/commit/0c1c83e5e69579669f77fc6b1ca80d58f2c57b1a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-06-01T08:33:20+03:00
Commit Message:
MADS: Bugfixes for scene 352
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 5ccc7ca..a181694 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -4174,7 +4174,7 @@ void Scene352::putArmDown(bool corridorExit, bool doorwayExit) {
case 2: {
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 6, 0, 0, 0);
- int idx = _scene->_dynamicHotspots.add(NOUN_GUARDS_ARM, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0));
+ int idx = _scene->_dynamicHotspots.add(NOUN_GUARDS_ARM2, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(230, 117), FACING_NORTHWEST);
_scene->changeVariant(0);
}
@@ -4269,7 +4269,7 @@ void Scene352::enter() {
if (_game._objects.isInRoom(OBJ_GUARDS_ARM)) {
_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 6, 0, 0, 0);
- int idx = _scene->_dynamicHotspots.add(NOUN_GUARDS_ARM, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0));
+ int idx = _scene->_dynamicHotspots.add(NOUN_GUARDS_ARM2, VERB_WALKTO, _globals._sequenceIndexes[2], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(230, 117), FACING_NORTHWEST);
} else
_mustPutArmDownFl = true;
@@ -4326,14 +4326,14 @@ void Scene352::preActions() {
}
}
- if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM, NOUN_SCANNER)) {
+ if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM2, NOUN_SCANNER)) {
if (_globals[kSexOfRex] == REX_MALE)
_game._player.walk(Common::Point(269, 111), FACING_NORTHEAST);
else
_game._player.walk(Common::Point(271, 111), FACING_NORTHEAST);
}
- if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY) || _action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) || _action.isAction(VERB_PUT, NOUN_GUARDS_ARM, NOUN_FLOOR)) {
+ if (_action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY) || _action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) || _action.isAction(VERB_PUT, NOUN_GUARDS_ARM2, NOUN_FLOOR)) {
if (_game._objects.isInInventory(OBJ_GUARDS_ARM))
_game._player.walk(Common::Point(230, 117), FACING_NORTHWEST);
}
@@ -4412,7 +4412,7 @@ void Scene352::actions() {
exit_doorway = true;
}
- if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) || _action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY) || _action.isAction(VERB_PUT, NOUN_GUARDS_ARM, NOUN_FLOOR)) {
+ if (_action.isAction(VERB_WALK_DOWN, NOUN_CORRIDOR_TO_SOUTH) || _action.isAction(VERB_WALK_THROUGH, NOUN_DOORWAY) || _action.isAction(VERB_PUT, NOUN_GUARDS_ARM2, NOUN_FLOOR)) {
if (_mustPutArmDownFl)
putArmDown(exit_corridor, exit_doorway);
else if (exit_corridor)
@@ -4424,7 +4424,7 @@ void Scene352::actions() {
return;
}
- if (_action.isAction(VERB_TAKE, NOUN_GUARDS_ARM)) {
+ if (_action.isAction(VERB_TAKE, NOUN_GUARDS_ARM2)) {
if (_game._trigger || !_game._objects.isInInventory(OBJ_GUARDS_ARM)) {
switch (_game._trigger) {
case 0:
@@ -4460,7 +4460,7 @@ void Scene352::actions() {
}
}
- if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM, NOUN_SCANNER)) {
+ if (_action.isAction(VERB_PUT, NOUN_GUARDS_ARM2, NOUN_SCANNER)) {
if (!_vaultOpenFl) {
switch (_game._trigger) {
case 0:
@@ -4618,7 +4618,7 @@ void Scene352::actions() {
_game._player._visible = true;
_game._player._stepEnabled = true;
- _vm->_dialogs->showItem(OBJ_TAPE_PLAYER, 0x899B);
+ _vm->_dialogs->showItem(OBJ_TAPE_PLAYER, 35227);
break;
default:
@@ -4639,7 +4639,7 @@ void Scene352::actions() {
_vm->_dialogs->show(35215);
else if (_action.isAction(VERB_LOOK, NOUN_AIR_VENT))
_vm->_dialogs->show(35216);
- else if (_action.isAction(VERB_LOOK, NOUN_GUARDS_ARM) && (_action._savedFields._mainObjectSource == 4))
+ else if (_action.isAction(VERB_LOOK, NOUN_GUARDS_ARM2) && (_action._savedFields._mainObjectSource == 4))
_vm->_dialogs->show(35217);
else if (_action.isAction(VERB_LOOK, NOUN_IRONING_BOARD))
_vm->_dialogs->show(35218);
@@ -4674,6 +4674,8 @@ void Scene352::actions() {
_vm->_dialogs->show(35235);
else
return;
+
+ _action._inProgress = false;
}
/*------------------------------------------------------------------------*/
Commit: 5e5a37e9786cedeff4159094705aa94d33cc9ec4
https://github.com/scummvm/scummvm/commit/5e5a37e9786cedeff4159094705aa94d33cc9ec4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-06-01T08:33:51+03:00
Commit Message:
MADS: Fix sitting on the bar stool in scene 402 (bar)
Changed paths:
engines/mads/nebular/nebular_scenes4.cpp
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index d114232..4763391 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -2183,10 +2183,10 @@ void Scene402::actions() {
_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
_scene->_sequences.addTimer(120, 44);
_game._player._stepEnabled = false;
- } else if (_action.isAction(VERB_WALK_ALONG, NOUN_BAR_STOOL) && (_game._player._targetPos.x == 248)){
+ } else if (_action.isAction(VERB_SIT_ON, NOUN_BAR_STOOL) && (_game._player._targetPos.x == 248)){
_scene->_kernelMessages.add(Common::Point(0, -14), 0x1110, 34, 0, 120, _game.getQuote(0x20D));
_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x20E));
- } else if (_action.isAction(VERB_WALK_ALONG, NOUN_BAR_STOOL) && !_roxOnStool && (_game._player._targetPos.x != 248)) {
+ } else if (_action.isAction(VERB_SIT_ON, NOUN_BAR_STOOL) && !_roxOnStool && (_game._player._targetPos.x != 248)) {
_game._player._visible = false;
_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
_globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 7, 1, 0, 0);
More information about the Scummvm-git-logs
mailing list