diff options
| author | Strangerke | 2014-03-29 22:47:21 +0100 |
|---|---|---|
| committer | Strangerke | 2014-03-29 22:47:21 +0100 |
| commit | 03af091a16c937844eb3bd33f7870de79e1cc8b5 (patch) | |
| tree | 14b601f7adabced82abfe1f8e3eda6b82c603b3a | |
| parent | 87c97a1bcba272245865b8f221ed38d7e7b29e12 (diff) | |
| download | scummvm-rg350-03af091a16c937844eb3bd33f7870de79e1cc8b5.tar.gz scummvm-rg350-03af091a16c937844eb3bd33f7870de79e1cc8b5.tar.bz2 scummvm-rg350-03af091a16c937844eb3bd33f7870de79e1cc8b5.zip | |
MADS: Remove some magic values related to verbs
| -rw-r--r-- | engines/mads/action.cpp | 4 | ||||
| -rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 2 | ||||
| -rw-r--r-- | engines/mads/scene_data.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp index c762b9b993..240b493930 100644 --- a/engines/mads/action.cpp +++ b/engines/mads/action.cpp @@ -58,7 +58,7 @@ void MADSAction::clear() { _hotspotId = -1; _v86F3A = -1; _v86F4C = -1; - _action._verbId = -1; + _action._verbId = VERB_NONE; _action._objectNameId = -1; _action._indirectObjectId = -1; _textChanged = true; @@ -89,7 +89,7 @@ void MADSAction::set() { bool flag = false; _statusText = ""; - _action._verbId = -1; + _action._verbId = VERB_NONE; _action._objectNameId = -1; _action._indirectObjectId = -1; diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index f00aae4873..79143a935d 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -492,7 +492,7 @@ void Scene202::step() { if (_globals[kMeteorologistWatch] == 1) { MADSAction *action = _game._player._action; - action->_activeAction._verbId = 3; + action->_activeAction._verbId = VERB_LOOK; action->_activeAction._objectNameId = 39; action->_activeAction._indirectObjectId = 438; _game._triggerSetupMode = KERNEL_TRIGGER_PARSER; diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp index abe0b7bf21..4c19202f4b 100644 --- a/engines/mads/scene_data.cpp +++ b/engines/mads/scene_data.cpp @@ -42,7 +42,7 @@ KernelMessage::KernelMessage() { _timeout = 0; _trigger = 0; _abortMode = KERNEL_TRIGGER_PARSER; - _actionDetails._verbId = 0; + _actionDetails._verbId = VERB_NONE; _actionDetails._objectNameId = 0; _actionDetails._indirectObjectId = 0; } |