[Scummvm-cvs-logs] SF.net SVN: scummvm:[34201] scummvm/trunk/engines/scumm

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Aug 29 11:44:06 CEST 2008


Revision: 34201
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34201&view=rev
Author:   fingolfin
Date:     2008-08-29 09:44:05 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Made out-of-memory error in SCUMM a bit more verbose

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/dialogs.cpp
    scummvm/trunk/engines/scumm/resource.cpp

Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp	2008-08-28 09:03:43 UTC (rev 34200)
+++ scummvm/trunk/engines/scumm/dialogs.cpp	2008-08-29 09:44:05 UTC (rev 34201)
@@ -395,8 +395,7 @@
 		int hours = minutes / 60;
 		minutes %= 60;
 
-		snprintf(buffer, 32, "Playtime: %.2d:%.2d",
-			hours & 0xFF, minutes & 0xFF);
+		snprintf(buffer, 32, "Playtime: %.2d:%.2d", hours, minutes);
 		_playtime->setLabel(buffer);
 	} else {
 		_date->setLabel("No date saved");

Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp	2008-08-28 09:03:43 UTC (rev 34200)
+++ scummvm/trunk/engines/scumm/resource.cpp	2008-08-29 09:44:05 UTC (rev 34201)
@@ -809,7 +809,7 @@
 
 	ptr = (byte *)calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1);
 	if (ptr == NULL) {
-		error("Out of memory while allocating %d", size);
+		error("createResource(%s,%d): Out of memory while allocating %d", resTypeFromId(type), idx, size);
 	}
 
 	_allocatedSize += size;


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




More information about the Scummvm-git-logs mailing list