diff options
| author | Max Horn | 2002-12-27 16:49:08 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-27 16:49:08 +0000 |
| commit | 21226d1fb0c9ddf23ffc8e9f3211af1f71dd0b87 (patch) | |
| tree | 36e9141cdd1064a3003055f6cb5114978fd84424 /scumm/script_v8.cpp | |
| parent | ad06190dd95365f1e6154791541d8f314f820407 (diff) | |
| download | scummvm-rg350-21226d1fb0c9ddf23ffc8e9f3211af1f71dd0b87.tar.gz scummvm-rg350-21226d1fb0c9ddf23ffc8e9f3211af1f71dd0b87.tar.bz2 scummvm-rg350-21226d1fb0c9ddf23ffc8e9f3211af1f71dd0b87.zip | |
verb ids can be > 255 in V8; more V8 verbop corrections
svn-id: r6204
Diffstat (limited to 'scumm/script_v8.cpp')
| -rw-r--r-- | scumm/script_v8.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 410fa733a3..acf62fb92c 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -1202,13 +1202,16 @@ void Scumm_v8::o8_cameraOps() void Scumm_v8::o8_verbOps() { - // TODO byte subOp = fetchScriptByte(); VerbSlot *vs = NULL; int slot, a, b; + _verbRedraw = true; + if (0 <= _curVerbSlot && _curVerbSlot < _maxVerbs) vs = &_verbs[_curVerbSlot]; + if (subOp != 0x96) + assert(vs); switch (subOp) { case 0x96: // SO_VERB_INIT Choose verb number for editing @@ -1217,8 +1220,7 @@ void Scumm_v8::o8_verbOps() checkRange(_maxVerbs - 1, 0, _curVerbSlot, "Illegal new verb slot %d"); break; case 0x97: // SO_VERB_NEW New verb - slot = getVerbSlot(_curVerb, 0); - if (slot == 0) { + if (_curVerbSlot == 0) { for (slot = 1; slot < _maxVerbs; slot++) { if (_verbs[slot].verbid == 0) break; @@ -1227,7 +1229,7 @@ void Scumm_v8::o8_verbOps() error("Too many verbs"); _curVerbSlot = slot; } - vs = &_verbs[slot]; + vs = &_verbs[_curVerbSlot]; vs->verbid = _curVerb; vs->color = 2; vs->hicolor = 0; @@ -1302,6 +1304,9 @@ void Scumm_v8::o8_verbOps() break; case 0xA7: // SO_VERB_LINE_SPACING Choose linespacing for verb // FIXME - TODO + // Note: it seems that var596 stores the "line spacing". It is used by various + // scripts that place verbs for that. + // Also, var595 contains the vertical position at which to start placing verbs (330) pop(); break; default: |