diff options
| author | Max Horn | 2006-09-16 13:38:43 +0000 |
|---|---|---|
| committer | Max Horn | 2006-09-16 13:38:43 +0000 |
| commit | b860f002b2f1f1a6cc67a9deb8360a8d421e2a4e (patch) | |
| tree | 144c8c7d881894583afdd66b3a584f38520fd699 /engines/scumm/he/script_v72he.cpp | |
| parent | 61626263236a4e3b9397bd3dfd9c467a4a9a0d31 (diff) | |
| download | scummvm-rg350-b860f002b2f1f1a6cc67a9deb8360a8d421e2a4e.tar.gz scummvm-rg350-b860f002b2f1f1a6cc67a9deb8360a8d421e2a4e.tar.bz2 scummvm-rg350-b860f002b2f1f1a6cc67a9deb8360a8d421e2a4e.zip | |
Replaced checkRange by assertRange, which has (a) an (IMO) more logical order of parameters, and (b) removes lots of useless duplicate information in error messages
svn-id: r23885
Diffstat (limited to 'engines/scumm/he/script_v72he.cpp')
| -rw-r--r-- | engines/scumm/he/script_v72he.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 22ff50476a..e4bfad4b0d 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -1174,7 +1174,7 @@ void ScummEngine_v72he::o72_actorOps() { case 86: // SO_PALETTE j = pop(); i = pop(); - checkRange(255, 0, i, "Illegal palette slot %d"); + assertRange(0, i, 255, "palette slot"); a->remapActorPaletteColor(i, j); a->_needRedraw = true; break; @@ -1279,7 +1279,7 @@ void ScummEngine_v72he::o72_verbOps() { if (subOp == 196) { _curVerb = pop(); _curVerbSlot = getVerbSlot(_curVerb, 0); - checkRange(_numVerbs - 1, 0, _curVerbSlot, "Illegal new verb slot %d"); + assertRange(0, _curVerbSlot, _numVerbs - 1, "new verb slot"); return; } vs = &_verbs[_curVerbSlot]; |