aboutsummaryrefslogtreecommitdiff
path: root/engines/sword1/objectman.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2009-05-31 10:02:16 +0000
committerTorbjörn Andersson2009-05-31 10:02:16 +0000
commit0999534749f6c4edb9e4d054b95f185b829adba3 (patch)
tree55744aee72afd7cc699213a88be65938e70fa0a0 /engines/sword1/objectman.cpp
parent3b311c65d0140e8bf727910d230ffd7a7f803761 (diff)
downloadscummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.tar.gz
scummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.tar.bz2
scummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.zip
The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-) svn-id: r41061
Diffstat (limited to 'engines/sword1/objectman.cpp')
-rw-r--r--engines/sword1/objectman.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp
index afd17b118c..703f422b8b 100644
--- a/engines/sword1/objectman.cpp
+++ b/engines/sword1/objectman.cpp
@@ -136,7 +136,7 @@ uint32 ObjectMan::lastTextNumber(int section) {
Object *ObjectMan::fetchObject(uint32 id) {
uint8 *addr = _cptData[id / ITM_PER_SEC];
if (!addr)
- error("fetchObject: section %d is not open!", id / ITM_PER_SEC);
+ error("fetchObject: section %d is not open", id / ITM_PER_SEC);
id &= ITM_ID;
// DON'T do endian conversion here. it's already done.
return (Object*)(addr + *(uint32*)(addr + (id + 1)*4));
@@ -144,7 +144,7 @@ Object *ObjectMan::fetchObject(uint32 id) {
uint32 ObjectMan::fetchNoObjects(int section) {
if (_cptData[section] == NULL)
- error("fetchNoObjects: section %d is not open!", section);
+ error("fetchNoObjects: section %d is not open", section);
return *(uint32*)_cptData[section];
}