diff options
| author | Max Horn | 2003-12-26 23:11:35 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-26 23:11:35 +0000 |
| commit | e3e6bb3191f57179874447b4f264721a2bc8a128 (patch) | |
| tree | 79599fadda78269c8031aae733574aff65194899 /scumm/script_v8.cpp | |
| parent | 706d2f1e5a978c507666f6669aa3e21fc095a82a (diff) | |
| download | scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.tar.gz scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.tar.bz2 scummvm-rg350-e3e6bb3191f57179874447b4f264721a2bc8a128.zip | |
got rid of those _maxFOO macros, replaced them by access to the equivalent _numFOO variables
svn-id: r11953
Diffstat (limited to 'scumm/script_v8.cpp')
| -rw-r--r-- | scumm/script_v8.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 1d26983ddf..9d5822db0a 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -1114,12 +1114,12 @@ void ScummEngine_v8::o8_verbOps() { if (subOp == 0x96) { _curVerb = pop(); _curVerbSlot = getVerbSlot(_curVerb, 0); - checkRange(_maxVerbs - 1, 0, _curVerbSlot, "Illegal new verb slot %d"); + checkRange(_numVerbs - 1, 0, _curVerbSlot, "Illegal new verb slot %d"); //printf("Setting current actor to %d\n", _curActor); return; } - assert(0 <= _curVerbSlot && _curVerbSlot < _maxVerbs); + assert(0 <= _curVerbSlot && _curVerbSlot < _numVerbs); vs = &_verbs[_curVerbSlot]; assert(vs); @@ -1129,11 +1129,11 @@ void ScummEngine_v8::o8_verbOps() { break; case 0x97: // SO_VERB_NEW New verb if (_curVerbSlot == 0) { - for (slot = 1; slot < _maxVerbs; slot++) { + for (slot = 1; slot < _numVerbs; slot++) { if (_verbs[slot].verbid == 0) break; } - if (slot >= _maxVerbs) { + if (slot >= _numVerbs) { error("Too many verbs"); } _curVerbSlot = slot; |