[Scummvm-cvs-logs] scummvm master -> 3e2acf3545be5896df8d6a72dec58c4608c4187d
bluegr
bluegr at gmail.com
Sun Jun 1 12:45:06 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:
4cf72ee86f MADS: Use friendly names for the screen input mode
3e2acf3545 MADS: Bugfixes for scene 411 (lab)
Commit: 4cf72ee86ff980733f9a29b7b7c98b8c82c4b10d
https://github.com/scummvm/scummvm/commit/4cf72ee86ff980733f9a29b7b7c98b8c82c4b10d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-06-01T13:44:25+03:00
Commit Message:
MADS: Use friendly names for the screen input mode
Changed paths:
engines/mads/nebular/nebular_scenes2.cpp
engines/mads/nebular/nebular_scenes3.cpp
engines/mads/nebular/nebular_scenes6.cpp
engines/mads/nebular/nebular_scenes7.cpp
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 36e7107..48cc852 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1290,7 +1290,7 @@ void Scene205::handleWomanSpeech(int quote) {
}
void Scene205::actions() {
- if (_game._screenObjects._inputMode == 1) {
+ if (_game._screenObjects._inputMode == kInputConversation) {
if (_kernelMessage >= 0)
_scene->_kernelMessages.remove(_kernelMessage);
_kernelMessage = -1;
@@ -4449,7 +4449,7 @@ void Scene210::preActions() {
void Scene210::actions() {
if (_action.isAction(VERB_LOOK, NOUN_BINOCULARS, NOUN_HUT_TO_NORTH)) {
_vm->_dialogs->show(21017);
- } else if (_game._screenObjects._inputMode == 1) {
+ } else if (_game._screenObjects._inputMode == kInputConversation) {
handleConversations();
} else if (_action.isAction(VERB_TALKTO, NOUN_NATIVE_WOMAN) ||
((_game._player._playerPos == Common::Point(214, 150)) && (_game._player._facing == FACING_NORTHWEST) && (_twinkleAnimationType == 1) && _stopWalking)) {
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index a181694..bcedf95 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -870,7 +870,7 @@ void Scene307::step() {
_lastFrameTime = _scene->_frameStartTime;
if ((_guardTime > 3000) && !_duringPeeingFl && (_scene->_activeAnimation == nullptr)
- && (_game._screenObjects._inputMode != 1) && _globals[kMetBuddyBeast] && !_activePrisonerFl) {
+ && (_game._screenObjects._inputMode != kInputConversation) && _globals[kMetBuddyBeast] && !_activePrisonerFl) {
if (!_game._objects.isInInventory(OBJ_SCALPEL) && !_grateOpenedFl) {
_game._player._stepEnabled = false;
_game._player.walk(Common::Point(151, 119), FACING_SOUTHEAST);
@@ -879,7 +879,7 @@ void Scene307::step() {
_scene->loadAnimation(formAnimName('b', -1), 70);
}
_guardTime = 0;
- } else if ((_prisonerTimer > 300) && (_game._screenObjects._inputMode != 1) && (_scene->_activeAnimation == nullptr) && !_activePrisonerFl) {
+ } else if ((_prisonerTimer > 300) && (_game._screenObjects._inputMode != kInputConversation) && (_scene->_activeAnimation == nullptr) && !_activePrisonerFl) {
if (!_globals[kMetBuddyBeast]) {
int idx = _scene->_kernelMessages.add(Common::Point(5, 51), 0xFDFC, 0, 81, 120, _game.getQuote(_prisonerMessageId));
_scene->_kernelMessages.setQuoted(idx, 4, true);
@@ -909,7 +909,7 @@ void Scene307::step() {
void Scene307::actions() {
if (_action._lookFlag)
_vm->_dialogs->show(30715);
- else if (_game._screenObjects._inputMode == 1)
+ else if (_game._screenObjects._inputMode == kInputConversation)
handleDialog();
else if (_action.isAction(VERB_TALKTO, NOUN_CELL_WALL) || _action.isAction(VERB_TALKTO, NOUN_WALL) || _action.isAction(VERB_TALKTO, NOUN_TOILET)) {
int node, say;
@@ -2803,7 +2803,7 @@ void Scene318::step() {
_animMode = 3;
}
} else if ((_animMode == 2) && _explosionFl && _internVisibleFl && !_dialogFl
- && !_internWalkingFl && (_game._screenObjects._inputMode != 1)) {
+ && !_internWalkingFl && (_game._screenObjects._inputMode != kInputConversation)) {
if ((diffFrame >= 0) && (diffFrame <= 4))
_internCounter += diffFrame;
else
@@ -2833,7 +2833,7 @@ void Scene318::preActions() {
}
void Scene318::actions() {
- if (_game._screenObjects._inputMode == 1) {
+ if (_game._screenObjects._inputMode == kInputConversation) {
handleDialog();
_action._inProgress = false;
return;
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index eb85fa8..557e8c3 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -4345,7 +4345,7 @@ void Scene611::preActions() {
}
void Scene611::actions() {
- if (_game._screenObjects._inputMode == 1)
+ if (_game._screenObjects._inputMode == kInputConversation)
handleDialog();
else if ((_action.isAction(VERB_GIVE, NOUN_PHONE_CELLS, NOUN_HERMIT)) || (_action.isAction(VERB_GIVE, NOUN_DURAFAIL_CELLS, NOUN_HERMIT))) {
_action._activeAction._verbId = 0x294;
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index d59f7ff..1e01ce0 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -1026,7 +1026,7 @@ void Scene703::step() {
}
void Scene703::actions() {
- if (_game._screenObjects._inputMode == 1)
+ if (_game._screenObjects._inputMode == kInputConversation)
handleFillBottle(_action._activeAction._verbId);
else if (_action.isAction(VERB_STEER_TOWARDS, NOUN_DOCK_TO_SOUTH)) {
_game._player._stepEnabled = false;
@@ -1412,7 +1412,7 @@ void Scene704::step() {
}
void Scene704::actions() {
- if (_game._screenObjects._inputMode == 1)
+ if (_game._screenObjects._inputMode == kInputConversation)
handleFillBottle(_action._activeAction._verbId);
else if (_action.isAction(VERB_STEER_TOWARDS, NOUN_OPEN_WATER_TO_SOUTH)) {
_game._player._stepEnabled = false;
@@ -1662,7 +1662,7 @@ void Scene705::step() {
}
void Scene705::actions() {
- if (_game._screenObjects._inputMode == 1)
+ if (_game._screenObjects._inputMode == kInputConversation)
handleFillBottle(_action._activeAction._verbId);
else if (_action.isAction(VERB_STEER_TOWARDS, NOUN_OPEN_WATER_TO_SOUTH)) {
switch (_game._trigger) {
Commit: 3e2acf3545be5896df8d6a72dec58c4608c4187d
https://github.com/scummvm/scummvm/commit/3e2acf3545be5896df8d6a72dec58c4608c4187d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-06-01T13:44:25+03:00
Commit Message:
MADS: Bugfixes for scene 411 (lab)
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 4763391..ccf8d76 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -2085,7 +2085,7 @@ void Scene402::actions() {
} else if (_game._trigger == 167) {
_vm->_dialogs->showItem(OBJ_REPAIR_LIST, 40240);
_game._player._stepEnabled = true;
- } else if (_game._screenObjects._inputMode == 1)
+ } else if (_game._screenObjects._inputMode == kInputConversation)
handleDialogs();
else if (_action.isAction(VERB_WALK_INTO, NOUN_CORRIDOR_TO_SOUTH))
_scene->_nextSceneId = 401;
@@ -3494,7 +3494,7 @@ void Scene411::handleDialog() {
_scene->_activeAnimation->setCurrentFrame(_resetFrame);
}
_scene->_kernelMessages.reset();
- _newQuantity = computeQuoteAndQuantity ();
+ _newQuantity = computeQuoteAndQuantity();
if ((_globals[kNextIngredient] == 1) && (_globals[kBadFirstIngredient] > -1))
_killRox = true;
@@ -3577,12 +3577,12 @@ void Scene411::enter() {
_dialog3.setup(0x5D, 0x254, 0x260, 0x25C, 0x258, 0x262, -1);
_dialog4.setup(0x5E, 0x255, 0x261, 0x25D, 0x259, 0x262, -1);
- if (_globals[kNextIngredient] >= 4 && _game._objects[OBJ_CHARGE_CASES].getQuality(3)) {
- _scene->_hotspots.activate(NOUN_EXPLOSIVES, false);
- _scene->_hotspots.activate(NOUN_KETTLE, true);
- } else {
+ if (_globals[kNextIngredient] >= 4 && !_game._objects[OBJ_CHARGE_CASES].getQuality(3)) {
_scene->_hotspots.activate(NOUN_KETTLE, false);
_scene->_hotspots.activate(NOUN_EXPLOSIVES, true);
+ } else {
+ _scene->_hotspots.activate(NOUN_EXPLOSIVES, false);
+ _scene->_hotspots.activate(NOUN_KETTLE, true);
}
if (_globals[kNextIngredient] >= 4 && _game._objects[OBJ_CHARGE_CASES].getQuality(3)) {
@@ -3769,7 +3769,7 @@ void Scene411::preActions() {
}
void Scene411::actions() {
- if (_game._screenObjects._inputMode != 1) {
+ if (_game._screenObjects._inputMode == kInputConversation) {
handleDialog();
_action._inProgress = false;
return;
@@ -3933,8 +3933,11 @@ void Scene411::actions() {
if (_game._trigger == 10)
_vm->_dialogs->showItem(OBJ_FORMALDEHYDE, 41124);
- if (_action.isAction(VERB_PUT, NOUN_KETTLE)) {
- if (_action.isObject(NOUN_PETROX) || _action.isObject(NOUN_FORMALDEHYDE) || _action.isObject(NOUN_LECITHIN) || _action.isObject(NOUN_ALIEN_LIQUOR)) {
+ if (_action.isAction(VERB_PUT) && _action.isTarget(NOUN_KETTLE)) {
+ if (_action.isObject(NOUN_PETROX) ||
+ _action.isObject(NOUN_FORMALDEHYDE) ||
+ _action.isObject(NOUN_LECITHIN) ||
+ _action.isObject(NOUN_ALIEN_LIQUOR)) {
_newIngredient = _game._objects.getIdFromDesc(_action._activeAction._objectNameId);
switch (_newIngredient) {
case OBJ_ALIEN_LIQUOR:
More information about the Scummvm-git-logs
mailing list