diff options
author | Tobias Gunkel | 2012-01-07 20:06:26 +0100 |
---|---|---|
committer | Tobias Gunkel | 2012-02-11 08:28:19 +0100 |
commit | 706b8cf1c531e15b980a64060a1080e17e854d98 (patch) | |
tree | 4a5a50cb9b7815a9f20345e81737e89cca7f3fa6 /engines/scumm/script_v0.cpp | |
parent | b01f601d7e8dc0b7885ff058c8596dc2ad6762f4 (diff) | |
download | scummvm-rg350-706b8cf1c531e15b980a64060a1080e17e854d98.tar.gz scummvm-rg350-706b8cf1c531e15b980a64060a1080e17e854d98.tar.bz2 scummvm-rg350-706b8cf1c531e15b980a64060a1080e17e854d98.zip |
SCUMM: replace verb, prep and currentMode values with symbolic constants
Diffstat (limited to 'engines/scumm/script_v0.cpp')
-rw-r--r-- | engines/scumm/script_v0.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index 0f9fbc6e6f..31363ed140 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -422,8 +422,8 @@ void ScummEngine_v0::drawSentence() { return; // Current Verb - if (_activeVerb == 0) - _activeVerb = 13; + if (_activeVerb == kVerbNone) + _activeVerb = kVerbWalkTo; if (getResourceAddress(rtVerb, _activeVerb)) { _sentenceBuf = (char *)getResourceAddress(rtVerb, _activeVerb); } else { @@ -602,15 +602,15 @@ void ScummEngine_v0::o_cursorCommand() { _currentMode = fetchScriptByte(); switch (_currentMode) { - case 0: + case kModeCutscene: state = 15; break; - case 1: + case kModeKeypad: state = 31; break; - case 2: + case kModeNoNewKid: break; - case 3: + case kModeNormal: state = 247; break; } @@ -908,7 +908,7 @@ void ScummEngine_v0::o_setOwnerOf() { } void ScummEngine_v0::resetSentence(bool walking) { - _activeVerb = 13; + _activeVerb = kVerbWalkTo; // If the actor is walking, or the screen is a keypad (no sentence verbs/objects are drawn) // Then reset all active objects (stops the radio crash, bug #3077966) |