[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.12,1.13

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv7491/scumm

Modified Files:
	resource.cpp 
Log Message:
Fix annoying indentation of the CHECK_HEAP macro



Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- resource.cpp	25 Sep 2002 03:04:28 -0000	1.12
+++ resource.cpp	25 Sep 2002 03:09:00 -0000	1.13
@@ -1049,8 +1049,9 @@
 			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 *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 *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 @@
 
 	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 @@
 {
 	byte *ptr;
 
-	CHECK_HEAP if (!res.address[type])
+	CHECK_HEAP
+	if (!res.address[type])
 		return;
 
 	assert(idx >= 0 && idx < res.num[type]);