aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2014-06-01 13:43:20 +0300
committerFilippos Karapetis2014-06-01 13:44:25 +0300
commit4cf72ee86ff980733f9a29b7b7c98b8c82c4b10d (patch)
tree578683cf02746aa67914f73a1501d465b2630c6e /engines
parent0b4beb59b647b5ae6c2f783ad0031635bb6fcddc (diff)
downloadscummvm-rg350-4cf72ee86ff980733f9a29b7b7c98b8c82c4b10d.tar.gz
scummvm-rg350-4cf72ee86ff980733f9a29b7b7c98b8c82c4b10d.tar.bz2
scummvm-rg350-4cf72ee86ff980733f9a29b7b7c98b8c82c4b10d.zip
MADS: Use friendly names for the screen input mode
Diffstat (limited to 'engines')
-rw-r--r--engines/mads/nebular/nebular_scenes2.cpp4
-rw-r--r--engines/mads/nebular/nebular_scenes3.cpp10
-rw-r--r--engines/mads/nebular/nebular_scenes6.cpp2
-rw-r--r--engines/mads/nebular/nebular_scenes7.cpp6
4 files changed, 11 insertions, 11 deletions
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 36e7107609..48cc852d38 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 a1816947ce..bcedf95a27 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 eb85fa86e1..557e8c3bac 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 d59f7ff5f3..1e01ce0479 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) {