[Scummvm-cvs-logs] SF.net SVN: scummvm:[47659] scummvm/trunk/engines/sci/engine/seg_manager. cpp

[thebluegr at users.sourceforge.net]

Revision: 47659
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47659&view=rev
Author:   thebluegr
Date:     2010-01-28 22:58:09 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
Added some more information on the errors thrown by lookupString() and freeString() - Torin full currently crashes in lookupString, called from kString (strcpy)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-01-28 22:26:13 UTC (rev 47658)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-01-28 22:58:09 UTC (rev 47659)
@@ -1281,24 +1281,24 @@
 
 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.