aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorFilippos Karapetis2010-01-28 22:58:09 +0000
committerFilippos Karapetis2010-01-28 22:58:09 +0000
commite110b028959961df13f9e0156909cba8fb59c99a (patch)
treed12dc05b8d483e859546e619cc78b4c993a1c26e /engines/sci
parentb20ccaa8abd2c2e0f7424dd469428c2fe8701339 (diff)
downloadscummvm-rg350-e110b028959961df13f9e0156909cba8fb59c99a.tar.gz
scummvm-rg350-e110b028959961df13f9e0156909cba8fb59c99a.tar.bz2
scummvm-rg350-e110b028959961df13f9e0156909cba8fb59c99a.zip
Added some more information on the errors thrown by lookupString() and freeString() - Torin full currently crashes in lookupString, called from kString (strcpy)
svn-id: r47659
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/seg_manager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index 17cf855229..15de668610 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -1281,24 +1281,24 @@ SciString *SegManager::allocateString(reg_t *addr) {
SciString *SegManager::lookupString(reg_t addr) {
if (_heap[addr.segment]->getType() != SEG_TYPE_STRING)
- error("Attempt to use non-string %04x:%04x as string", PRINT_REG(addr));
+ error("lookupString: Attempt to use non-string %04x:%04x as string", PRINT_REG(addr));
StringTable *stringTable = (StringTable *)_heap[addr.segment];
if (!stringTable->isValidEntry(addr.offset))
- error("Attempt to use non-string %04x:%04x as string", PRINT_REG(addr));
+ error("lookupString: Attempt to use non-string %04x:%04x as string", PRINT_REG(addr));
return &(stringTable->_table[addr.offset]);
}
void SegManager::freeString(reg_t addr) {
if (_heap[addr.segment]->getType() != SEG_TYPE_STRING)
- error("Attempt to use non-string %04x:%04x as string", PRINT_REG(addr));
+ error("freeString: Attempt to use non-string %04x:%04x as string", PRINT_REG(addr));
StringTable *stringTable = (StringTable *)_heap[addr.segment];
if (!stringTable->isValidEntry(addr.offset))
- error("Attempt to use non-string %04x:%04x as string", PRINT_REG(addr));
+ error("freeString: Attempt to use non-string %04x:%04x as string", PRINT_REG(addr));
stringTable->_table[addr.offset].destroy();
stringTable->freeEntry(addr.offset);