aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/resource.cpp
diff options
context:
space:
mode:
authorMax Horn2006-09-16 13:38:43 +0000
committerMax Horn2006-09-16 13:38:43 +0000
commitb860f002b2f1f1a6cc67a9deb8360a8d421e2a4e (patch)
tree144c8c7d881894583afdd66b3a584f38520fd699 /engines/scumm/resource.cpp
parent61626263236a4e3b9397bd3dfd9c467a4a9a0d31 (diff)
downloadscummvm-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/resource.cpp')
-rw-r--r--engines/scumm/resource.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 3dfc68071a..47e411dd06 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -579,7 +579,7 @@ void ScummEngine::loadCharset(int no) {
}
assert(no < (int)sizeof(_charsetData) / 16);
- checkRange(_numCharsets - 1, 1, no, "Loading illegal charset %d");
+ assertRange(1, no, _numCharsets - 1, "charset");
ptr = getResourceAddress(rtCharset, no);
@@ -589,7 +589,7 @@ void ScummEngine::loadCharset(int no) {
}
void ScummEngine::nukeCharset(int i) {
- checkRange(_numCharsets - 1, 1, i, "Nuking illegal charset %d");
+ assertRange(1, i, _numCharsets - 1, "charset");
res.nukeResource(rtCharset, i);
}