Index: neither/darkwar/Makefile
diff -u neither/darkwar/Makefile:1.17 neither/darkwar/Makefile:1.18
--- neither/darkwar/Makefile:1.17	Sat Apr  3 02:46:39 2004
+++ neither/darkwar/Makefile	Mon Apr  5 21:46:56 2004
@@ -15,7 +15,8 @@
 
 CC=gcc
 # CFLAGS=-MD -Wall -O2 -Icommon -Werror
-CFLAGS=-MD -Wall -g -ggdb `sdl-config --cflags` -I. -I game -I renderer -I fs
+#CFLAGS=-MD -O1 -g -Wall -Wno-unused -Wcast-qual -Wsign-compare -W -pg -pipe -finline -D_REENTRANT `sdl-config --cflags` -I. -I game -I renderer -I fs
+CFLAGS=-MD -Wall -O2 -g -ggdb `sdl-config --cflags` -I. -I game -I renderer -I fs
 #CFLAGS=-MD -Wall -O2 -pg -g -ggdb `sdl-config --cflags` -I. -I game -I renderer -I fs
 #CFLAGS=-MD -Wall -O2 `sdl-config --cflags` -I. -I game -I renderer -I fs
 
Index: neither/darkwar/nmemory.c
diff -u neither/darkwar/nmemory.c:1.25 neither/darkwar/nmemory.c:1.26
--- neither/darkwar/nmemory.c:1.25	Sun Apr  4 15:17:29 2004
+++ neither/darkwar/nmemory.c	Mon Apr  5 21:46:56 2004
@@ -302,28 +302,27 @@
 ========================
 */
 // TODO: rewrite this to not use Mem_EmptyZone perhaps
-void Mem_FreeZone( Mem_Zone **pzone )
+void Mem_FreeZone( Mem_Zone **zone )
 {
-	Mem_Zone * const zone = *pzone;
-	if ( !zone )
+	if ( !*zone )
 		wrap_cerror( "Null pointer!" );
 
-	Mem_EmptyZone( zone );
+	Mem_EmptyZone( *zone );
 
-	while ( zone->child )
-		Mem_FreeZone( &zone->child );
+	while ( (*zone)->child )
+		Mem_FreeZone( &(*zone)->child );
 
 	AllocStats_Update( &GlobalStats, 0, ZONE_OVERHEAD, true );
 
-	if( zone->prev )
-		zone->prev->next = zone->next;
-	else if( zone->parent )
-		zone->parent->child = zone->next;
-	if( zone->next )
-		zone->next->prev = zone->prev;
+	if ( (*zone)->prev )
+		(*zone)->prev->next = (*zone)->next;
+	else if ( (*zone)->parent )
+		(*zone)->parent->child = (*zone)->next;
+	if ( (*zone)->next )
+		(*zone)->next->prev = (*zone)->prev;
 
-	wrap_free( zone );
-	*pzone = NULL;
+	wrap_free( *zone );
+	*zone = NULL;
 }
 
 /*
@@ -440,15 +439,15 @@
     Mem_Zone		*zone;
 	Alloc_Header	*header;
 	Alloc_Trail		*trail;
-	void * const	p = *((void **) pp);
+	void			**p = (void **) pp;
 
-	if ( !p )
+	if ( !*p )
         wrap_cerror( "Null pointer (%s %i)!", filename, line );
 
 	// check the first sentinel
-	header = (Alloc_Header *) p - 1;
+	header = (Alloc_Header *) *p - 1;
 	if ( header->sentinel != SENTINEL )
-		wrap_cerror( "Header sentinel (alloc at %p) bad (%s %i)!", p, filename, line );
+		wrap_cerror( "Header sentinel (alloc at %p) bad (%s %i)!", *p, filename, line );
 
     zone = *( (Mem_Zone**) header->alloc );
 
@@ -467,9 +466,9 @@
 		alloc = (Alloc*) header->alloc;
 
 		// check the second sentinel
-		trail = (Alloc_Trail*) ( (char*) p + alloc->size );
+		trail = (Alloc_Trail*) ( (char*) *p + alloc->size );
 		if ( trail->sentinel != SENTINEL )
-			wrap_cerror( "Trail sentinel (alloc at %p by %s:%i) bad (%s:%i)!", p, alloc->filename, alloc->line, filename, line );
+			wrap_cerror( "Trail sentinel (alloc at %p by %s:%i) bad (%s:%i)!", *p, alloc->filename, alloc->line, filename, line );
 		
 		// unlink the alloc struct
 		if ( alloc->prev )
@@ -486,7 +485,7 @@
 		wrap_free( alloc );
 	}
 
-	pp = NULL;
+	*p = NULL;
 }
 
 /*
Index: neither/darkwar/nmemory.h
diff -u neither/darkwar/nmemory.h:1.19 neither/darkwar/nmemory.h:1.20
--- neither/darkwar/nmemory.h:1.19	Sun Apr  4 15:17:29 2004
+++ neither/darkwar/nmemory.h	Mon Apr  5 21:46:56 2004
@@ -18,10 +18,10 @@
 
 Mem_Zone	*_Mem_AllocZone( const char *name, Mem_Zone *parent, int clumpsize, int flag, const char *filename, int line );
 void		Mem_EmptyZone( Mem_Zone *zone );
-void		Mem_FreeZone( Mem_Zone **pzone );
+void		Mem_FreeZone( Mem_Zone **zone );
 
 void *_Mem_Alloc( Mem_Zone *zone, Nsize size, const char *filename, int line );
-void _Mem_Free( void *pp, const char *filename, int line );
+void _Mem_Free( void *p, const char *filename, int line );
 
 #define	Mem_AllocZone( name, parent, flag )				_Mem_AllocZone( name, parent, 0, flag , __FILE__, __LINE__ )
 #define	Mem_AllocClump( name, parent, clumpsize, flag )	_Mem_AllocZone( name, parent, clumpsize, flag | MEM_ZONE_CLUMP, __FILE__, __LINE__ )