thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r34201
This commit is contained in:
Max Horn 2008-08-29 09:44:05 +00:00
parent 9eaa119f31
commit c657f1d09a
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/scumm/dialogs.cpp
View file

@ -395,8 +395,7 @@ void SaveLoadChooser::updateInfos(bool redraw) {
int hours = minutes / 60; int hours = minutes / 60;
minutes %= 60; minutes %= 60;
snprintf(buffer, 32, "Playtime: %.2d:%.2d", snprintf(buffer, 32, "Playtime: %.2d:%.2d", hours, minutes);
hours & 0xFF, minutes & 0xFF);
_playtime->setLabel(buffer); _playtime->setLabel(buffer);
} else { } else {
_date->setLabel("No date saved"); _date->setLabel("No date saved");

2
engines/scumm/resource.cpp
View file

@ -809,7 +809,7 @@ byte *ResourceManager::createResource(int type, int idx, uint32 size) {
ptr = (byte *)calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1); ptr = (byte *)calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1);
if (ptr == NULL) { 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; _allocatedSize += size;