- fix funcname

Author: SoapyMan

src_rebuild/Game/C/civ_ai.c

@@ -78,7 +78,7 @@ int test555 = 0;
 
 #ifdef _DEBUG
 #define CIV_STATE_SET_CONFUSED(cp) \
-	printInfo("CIV confused: at %s, %d\n", __FUNCTION__, __LINE__);\
+	printInfo("CIV confused: at %s, %d\n", FUNCNAME, __LINE__);\
 	cp->ai.c.thrustState = 3; cp->ai.c.ctrlState = 7;
 #else
 #define CIV_STATE_SET_CONFUSED(cp) \

src_rebuild/Game/C/system.c

@@ -58,7 +58,7 @@ volatile char* _replay_buffer = NULL;		// 0x1FABBC
 
 #if defined(USE_CRT_MALLOC)
 
-char* mallocptr = NULL;
+volatile char* mallocptr = NULL;
 volatile char* malloctab = NULL;
 
 void* g_dynamicAllocs[1024] = { 0 };

src_rebuild/Game/C/system.h

@@ -59,7 +59,7 @@ extern void sys_freeall();
 #define D_TEMPALLOC(size)	sys_tempalloc(size)
 
 #ifdef _DEBUG
-#define D_MALLOC(size)		sys_malloc(size, __FUNCTION__, __LINE__)
+#define D_MALLOC(size)		sys_malloc(size, FUNCNAME, __LINE__)
 
 #else
 #define D_MALLOC(size)		sys_malloc(size, NULL, 0)
@@ -85,13 +85,13 @@ extern void sys_freeall();
 #define D_MALLOC_END() \
 		D_TEMPFREE();\
 		if(mallocptr > _oldmalloc)\
-			DMalloc_DebugPrint("malloc(%d) in %s, line %d. Malloc usage: %d\n", mallocptr-_oldmalloc, __FUNCTION__, __LINE__, (mallocptr-malloctab));\
+			DMalloc_DebugPrint("malloc(%d) in %s, line %d. Malloc usage: %d\n", mallocptr-_oldmalloc, FUNCNAME, __LINE__, (mallocptr-malloctab));\
 	} // D_MALLOC_BEGIN block
 #else
 #define D_MALLOC_END() \
 		D_TEMPFREE();\
 		if(mallocptr > _oldmalloc)\
-			DMalloc_DebugPrint("malloc(%d) in " __FUNCTION__ ", line %d. Malloc usage: %d\n", mallocptr-_oldmalloc, __LINE__, (mallocptr-malloctab));\
+			DMalloc_DebugPrint("malloc(%d) in " FUNCNAME ", line %d. Malloc usage: %d\n", mallocptr-_oldmalloc, __LINE__, (mallocptr-malloctab));\
 	} // D_MALLOC_BEGIN block
 #endif