libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix annoying indentation of the CHECK_HEAP macro

Browse Source 
svn-id: r5018
This commit is contained in:
James Brown 2002-09-25 03:09:00 +00:00
parent e9c1d9d802
commit b5efef6be5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scumm/resource.cpp
View File

@ -1049,8 +1049,9 @@ int Scumm::readSoundResourceSmallHeader(int type, int idx)
skip = 0x98;
}
ptr += skip; // size + instruments
size -= skip; // drop instruments for now
CHECK_HEAP track = (byte *)calloc(size, 1);
size -= skip; // drop instruments for now
CHECK_HEAP
track = (byte *)calloc(size, 1);
if (track == NULL) {
error("Out of memory while allocating %d", size);
}
@ -1111,7 +1112,8 @@ byte *Scumm::getResourceAddress(int type, int idx)
{
byte *ptr;
CHECK_HEAP if (!validateResource("getResourceAddress", type, idx))
CHECK_HEAP
if (!validateResource("getResourceAddress", type, idx))
return NULL;
if (!res.address[type]) {
@ -1174,7 +1176,8 @@ byte *Scumm::createResource(int type, int idx, uint32 size)
{
byte *ptr;
CHECK_HEAP debug(9, "createResource(%s,%d,%d)", resTypeFromId(type), idx, size);
CHECK_HEAP
debug(9, "createResource(%s,%d,%d)", resTypeFromId(type), idx, size);
if (!validateResource("allocating", type, idx))
return NULL;
@ -1182,7 +1185,8 @@ byte *Scumm::createResource(int type, int idx, uint32 size)
expireResources(size);
CHECK_HEAP ptr = (byte *)calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1);
CHECK_HEAP
ptr = (byte *)calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1);
if (ptr == NULL) {
error("Out of memory while allocating %d", size);
}
@ -1208,7 +1212,8 @@ void Scumm::nukeResource(int type, int idx)
{
byte *ptr;
CHECK_HEAP if (!res.address[type])
CHECK_HEAP
if (!res.address[type])
return;
assert(idx >= 0 && idx < res.num[type]);