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_v60he.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_v60he.cpp')
| -rw-r--r-- | engines/scumm/he/script_v60he.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 12a4b1c258..7610f9df01 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -554,7 +554,7 @@ void ScummEngine_v60he::o60_roomOps() { case 187: // SO_CYCLE_SPEED b = pop(); a = pop(); - checkRange(16, 1, a, "o60_roomOps: 187: color cycle out of range (%d)"); + assertRange(1, a, 16, "o60_roomOps: 187: color cycle"); _colorCycle[a - 1].delay = (b != 0) ? 0x4000 / (b * 0x4C) : 0; break; @@ -682,7 +682,7 @@ void ScummEngine_v60he::o60_actorOps() { case 86: // SO_PALETTE j = pop(); i = pop(); - checkRange(255, 0, i, "Illegal palette slot %d"); + assertRange(0, i, 255, "o60_actorOps: palette slot"); a->remapActorPaletteColor(i, j); a->_needRedraw = true; break; |