From b860f002b2f1f1a6cc67a9deb8360a8d421e2a4e Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 16 Sep 2006 13:38:43 +0000 Subject: 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 --- engines/scumm/script_v2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/scumm/script_v2.cpp') diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index aee06420c1..ace9a2fe8e 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -434,13 +434,13 @@ int ScummEngine_v2::readVar(uint var) { if (var >= 14 && var <= 16) var = _scummVars[var]; - checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)"); + assertRange(0, var, _numVariables - 1, "variable (reading)"); debugC(DEBUG_VARS, "readvar(%d) = %d", var, _scummVars[var]); return _scummVars[var]; } void ScummEngine_v2::writeVar(uint var, int value) { - checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)"); + assertRange(0, var, _numVariables - 1, "variable (writing)"); debugC(DEBUG_VARS, "writeVar(%d) = %d", var, value); if (VAR_CUTSCENEEXIT_KEY != 0xFF && var == VAR_CUTSCENEEXIT_KEY) { -- cgit v1.2.3