diff options
author | Paul Gilbert | 2014-04-15 23:51:41 -0400 |
---|---|---|
committer | Paul Gilbert | 2014-04-15 23:51:41 -0400 |
commit | 0b340a034330fd5124b1534544a8ef9500349411 (patch) | |
tree | 8d4bf80422ef360a78ecc41d8fc4aa088b449bc6 /engines/mads/nebular | |
parent | dea63c9fe8b64c30464119ffbfbc3491e6f158cc (diff) | |
download | scummvm-rg350-0b340a034330fd5124b1534544a8ef9500349411.tar.gz scummvm-rg350-0b340a034330fd5124b1534544a8ef9500349411.tar.bz2 scummvm-rg350-0b340a034330fd5124b1534544a8ef9500349411.zip |
MADS: Fix depth issues with sitting in chair in scene 101
Diffstat (limited to 'engines/mads/nebular')
-rw-r--r-- | engines/mads/nebular/nebular_scenes1.cpp | 6 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp index ec81b5f356..bb5229ef16 100644 --- a/engines/mads/nebular/nebular_scenes1.cpp +++ b/engines/mads/nebular/nebular_scenes1.cpp @@ -106,7 +106,7 @@ void Scene101::setup() { } void Scene101::sayDang() { - _game._triggerSetupMode = KERNEL_TRIGGER_DAEMON; + _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _game._player._stepEnabled = false; switch (_game._trigger) { @@ -608,7 +608,7 @@ void Scene102::setup() { void Scene102::addRandomMessage() { _scene->_kernelMessages.reset(); - _game._triggerSetupMode = KERNEL_TRIGGER_DAEMON; + _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; int quoteId = _vm->getRandomNumber(65, 69); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 73, 120, _game.getQuote(quoteId)); _activeMsgFl = true; @@ -838,7 +838,7 @@ void Scene102::actions() { Common::String curQuote = _game.getQuote(quoteId); int width = _vm->_font->getWidth(curQuote, -1); _scene->_kernelMessages.reset(); - _game._triggerSetupMode = KERNEL_TRIGGER_DAEMON; + _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_kernelMessages.add(Common::Point(210, 60), 0x1110, 0, 73, 120, curQuote); _scene->_kernelMessages.add(Common::Point(214 + width, 60), 0x1110, 0, 73, 120, _game.getQuote(64)); _activeMsgFl = true; diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index 36f291973b..96f6c6d400 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -455,7 +455,7 @@ void Scene202::enter() { void Scene202::setRandomKernelMessage() { int vocabId = _vm->getRandomNumber(92, 96); _scene->_kernelMessages.reset(); - _game._triggerSetupMode = KERNEL_TRIGGER_DAEMON; + _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 70, 120, _game.getQuote(vocabId)); _activeMsgFl = true; } @@ -491,7 +491,7 @@ void Scene202::step() { _action._activeAction._verbId = VERB_LOOK; _action._activeAction._objectNameId = 39; _action._activeAction._indirectObjectId = 438; - _game._triggerSetupMode = KERNEL_TRIGGER_PARSER; + _game._triggerSetupMode = SEQUENCE_TRIGGER_PARSER; _scene->_sequences.addTimer(120, 2); _globals._abortVal = -1; } else if (_globals[kMeteorologistWatch] == 2) { @@ -3087,7 +3087,7 @@ void Scene209::actions() { if ((_action.isAction(NOUN_SHOOT) || _action.isAction(NOUN_HOSE_DOWN)) && _action.isAction(NOUN_MONKEY) && _action.isAction(NOUN_BLOWGUN) && _game._objects.isInInventory(OBJ_BLOWGUN) && _game._objects.isInInventory(OBJ_POISON_DARTS)) { if (_action.isAction(NOUN_SHOOT, NOUN_BLOWGUN, NOUN_MONKEY) && !_startShootingInTimerFl) { - _game._triggerSetupMode = KERNEL_TRIGGER_DAEMON; + _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(1, 231); _startShootingInTimerFl = true; _game._player._stepEnabled = false; @@ -3097,7 +3097,7 @@ void Scene209::actions() { } if (_action.isAction(NOUN_HOSE_DOWN, NOUN_BLOWGUN, NOUN_MONKEY) && !_startShootingInTimerFl) { - _game._triggerSetupMode = KERNEL_TRIGGER_DAEMON; + _game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON; _scene->_sequences.addTimer(1, 228); _game._player._stepEnabled = false; _fallFl = true; |