* Removed jump pad code (and associated media loading)

* Removed loading of some Q3 cruft
* Spilled events attached to temporary entities are now reattached to their
  original entities, fixing the missing flame bug
* Fixed "suicide god" bug
* Fixed bug where zap ignores armour
* Fixed missing particle systems when follow-spectating
* Fixed potential bug involving dodgy pointer arithmetic in CG_LoadClientInfo
* Cleaned up logic in CG_AddPlayerWeapon
* MASK_SHOT traces no longer collide with corpses
* Corpses timeout in 20 seconds instead of 60
* Improved robustness of spawn validation, fixing the bug on transit
* A crapload of whitespace fixes

1 files changed, 160 insertions, 160 deletions

diff --git a/src/game/g_mem.c b/src/game/g_mem.c
index c553859b..2f3ed5c7 100644
--- a/src/game/g_mem.c
+++ b/src/game/g_mem.c
@@ -8,194 +8,194 @@
 
 #include "g_local.h"
 
-#define POOLSIZE		(256 * 1024)
-#define	FREEMEMCOOKIE	((int)0xDEADBE3F)	// Any unlikely to be used value
-#define	ROUNDBITS		31					// Round to 32 bytes
+#define POOLSIZE    (256 * 1024)
+#define  FREEMEMCOOKIE  ((int)0xDEADBE3F)  // Any unlikely to be used value
+#define  ROUNDBITS    31          // Round to 32 bytes
 
 struct freememnode
 {
-	// Size of ROUNDBITS
-	int cookie, size;				// Size includes node (obviously)
-	struct freememnode *prev, *next;
+  // Size of ROUNDBITS
+  int cookie, size;        // Size includes node (obviously)
+  struct freememnode *prev, *next;
 };
 
-static char		memoryPool[POOLSIZE];
+static char    memoryPool[POOLSIZE];
 static struct freememnode *freehead;
-static int		freemem;
+static int    freemem;
 
 void *G_Alloc( int size )
 {
-	// Find a free block and allocate.
-	// Does two passes, attempts to fill same-sized free slot first.
-
-	struct freememnode *fmn, *prev, *next, *smallest;
-	int allocsize, smallestsize;
-	char *endptr;
-	int *ptr;
-
-	allocsize = ( size + sizeof(int) + ROUNDBITS ) & ~ROUNDBITS;		// Round to 32-byte boundary
-	ptr = NULL;
-
-	smallest = NULL;
-	smallestsize = POOLSIZE + 1;		// Guaranteed not to miss any slots :)
-	for( fmn = freehead; fmn; fmn = fmn->next )
-	{
-		if( fmn->cookie != FREEMEMCOOKIE )
-			G_Error( "G_Alloc: Memory corruption detected!\n" );
-
-		if( fmn->size >= allocsize )
-		{
-			// We've got a block
-			if( fmn->size == allocsize )
-			{
-				// Same size, just remove
-
-				prev = fmn->prev;
-				next = fmn->next;
-				if( prev )
-					prev->next = next;			// Point previous node to next
-				if( next )
-					next->prev = prev;			// Point next node to previous
-				if( fmn == freehead )
-					freehead = next;			// Set head pointer to next
-				ptr = (int *) fmn;
-				break;							// Stop the loop, this is fine
-			}
-			else
+  // Find a free block and allocate.
+  // Does two passes, attempts to fill same-sized free slot first.
+
+  struct freememnode *fmn, *prev, *next, *smallest;
+  int allocsize, smallestsize;
+  char *endptr;
+  int *ptr;
+
+  allocsize = ( size + sizeof(int) + ROUNDBITS ) & ~ROUNDBITS;    // Round to 32-byte boundary
+  ptr = NULL;
+
+  smallest = NULL;
+  smallestsize = POOLSIZE + 1;    // Guaranteed not to miss any slots :)
+  for( fmn = freehead; fmn; fmn = fmn->next )
+  {
+    if( fmn->cookie != FREEMEMCOOKIE )
+      G_Error( "G_Alloc: Memory corruption detected!\n" );
+
+    if( fmn->size >= allocsize )
+    {
+      // We've got a block
+      if( fmn->size == allocsize )
       {
-				// Keep track of the smallest free slot
-				if( fmn->size < smallestsize )
-				{
-					smallest = fmn;
-					smallestsize = fmn->size;
-				}
-			}
-		}
-	}
-  
-	if( !ptr && smallest )
-	{
-		// We found a slot big enough
-		smallest->size -= allocsize;
-		endptr = (char *) smallest + smallest->size;
-		ptr = (int *) endptr;
-	}
-
-	if( ptr )
-	{
-		freemem -= allocsize;
-		if( g_debugAlloc.integer )
-			G_Printf( "G_Alloc of %i bytes (%i left)\n", allocsize, freemem );
-		memset( ptr, 0, allocsize );
-		*ptr++ = allocsize;				// Store a copy of size for deallocation
-		return( (void *) ptr );
-	}
-
-	G_Error( "G_Alloc: failed on allocation of %i bytes\n", size );
-	return( NULL );
+        // Same size, just remove
+
+        prev = fmn->prev;
+        next = fmn->next;
+        if( prev )
+          prev->next = next;      // Point previous node to next
+        if( next )
+          next->prev = prev;      // Point next node to previous
+        if( fmn == freehead )
+          freehead = next;      // Set head pointer to next
+        ptr = (int *) fmn;
+        break;              // Stop the loop, this is fine
+      }
+      else
+      {
+        // Keep track of the smallest free slot
+        if( fmn->size < smallestsize )
+        {
+          smallest = fmn;
+          smallestsize = fmn->size;
+        }
+      }
+    }
+  }
+
+  if( !ptr && smallest )
+  {
+    // We found a slot big enough
+    smallest->size -= allocsize;
+    endptr = (char *) smallest + smallest->size;
+    ptr = (int *) endptr;
+  }
+
+  if( ptr )
+  {
+    freemem -= allocsize;
+    if( g_debugAlloc.integer )
+      G_Printf( "G_Alloc of %i bytes (%i left)\n", allocsize, freemem );
+    memset( ptr, 0, allocsize );
+    *ptr++ = allocsize;        // Store a copy of size for deallocation
+    return( (void *) ptr );
+  }
+
+  G_Error( "G_Alloc: failed on allocation of %i bytes\n", size );
+  return( NULL );
 }
 
 void G_Free( void *ptr )
 {
-	// Release allocated memory, add it to the free list.
-
-	struct freememnode *fmn;
-	char *freeend;
-	int *freeptr;
-
-	freeptr = ptr;
-	freeptr--;
-
-	freemem += *freeptr;
-	if( g_debugAlloc.integer )
-		G_Printf( "G_Free of %i bytes (%i left)\n", *freeptr, freemem );
-
-	for( fmn = freehead; fmn; fmn = fmn->next )
-	{
-		freeend = ((char *) fmn) + fmn->size;
-		if( freeend == (char *) freeptr )
-		{
-			// Released block can be merged to an existing node
-
-			fmn->size += *freeptr;		// Add size of node.
-			return;
-		}
-	}
-	// No merging, add to head of list
-
-	fmn = (struct freememnode *) freeptr;
-	fmn->size = *freeptr;				// Set this first to avoid corrupting *freeptr
-	fmn->cookie = FREEMEMCOOKIE;
-	fmn->prev = NULL;
-	fmn->next = freehead;
-	freehead->prev = fmn;
-	freehead = fmn;
+  // Release allocated memory, add it to the free list.
+
+  struct freememnode *fmn;
+  char *freeend;
+  int *freeptr;
+
+  freeptr = ptr;
+  freeptr--;
+
+  freemem += *freeptr;
+  if( g_debugAlloc.integer )
+    G_Printf( "G_Free of %i bytes (%i left)\n", *freeptr, freemem );
+
+  for( fmn = freehead; fmn; fmn = fmn->next )
+  {
+    freeend = ((char *) fmn) + fmn->size;
+    if( freeend == (char *) freeptr )
+    {
+      // Released block can be merged to an existing node
+
+      fmn->size += *freeptr;    // Add size of node.
+      return;
+    }
+  }
+  // No merging, add to head of list
+
+  fmn = (struct freememnode *) freeptr;
+  fmn->size = *freeptr;        // Set this first to avoid corrupting *freeptr
+  fmn->cookie = FREEMEMCOOKIE;
+  fmn->prev = NULL;
+  fmn->next = freehead;
+  freehead->prev = fmn;
+  freehead = fmn;
 }
 
 void G_InitMemory( void )
 {
-	// Set up the initial node
-
-	freehead = (struct freememnode *)memoryPool;
-	freehead->cookie = FREEMEMCOOKIE;
-	freehead->size = POOLSIZE;
-	freehead->next = NULL;
-	freehead->prev = NULL;
-	freemem = sizeof( memoryPool );
+  // Set up the initial node
+
+  freehead = (struct freememnode *)memoryPool;
+  freehead->cookie = FREEMEMCOOKIE;
+  freehead->size = POOLSIZE;
+  freehead->next = NULL;
+  freehead->prev = NULL;
+  freemem = sizeof( memoryPool );
 }
 
 void G_DefragmentMemory( void )
 {
-	// If there's a frenzy of deallocation and we want to
-	// allocate something big, this is useful. Otherwise...
-	// not much use.
-
-	struct freememnode *startfmn, *endfmn, *fmn;
-
-	for( startfmn = freehead; startfmn; )
-	{
-		endfmn = (struct freememnode *)(((char *) startfmn) + startfmn->size);
-		for( fmn = freehead; fmn; )
-		{
-			if( fmn->cookie != FREEMEMCOOKIE )
-				G_Error( "G_DefragmentMemory: Memory corruption detected!\n" );
-
-			if( fmn == endfmn )
-			{
-				// We can add fmn onto startfmn.
-
-				if( fmn->prev )
-					fmn->prev->next = fmn->next;
-				if( fmn->next )
-				{
-					if( !(fmn->next->prev = fmn->prev) )
-						freehead = fmn->next;	// We're removing the head node
-				}
-				startfmn->size += fmn->size;
-				memset( fmn, 0, sizeof(struct freememnode) );	// A redundant call, really.
-
-				startfmn = freehead;
-				endfmn = fmn = NULL;				// Break out of current loop
-			}
-			else
-				fmn = fmn->next;
-		}
-
-		if( endfmn )
-			startfmn = startfmn->next;		// endfmn acts as a 'restart' flag here
-	}
+  // If there's a frenzy of deallocation and we want to
+  // allocate something big, this is useful. Otherwise...
+  // not much use.
+
+  struct freememnode *startfmn, *endfmn, *fmn;
+
+  for( startfmn = freehead; startfmn; )
+  {
+    endfmn = (struct freememnode *)(((char *) startfmn) + startfmn->size);
+    for( fmn = freehead; fmn; )
+    {
+      if( fmn->cookie != FREEMEMCOOKIE )
+        G_Error( "G_DefragmentMemory: Memory corruption detected!\n" );
+
+      if( fmn == endfmn )
+      {
+        // We can add fmn onto startfmn.
+
+        if( fmn->prev )
+          fmn->prev->next = fmn->next;
+        if( fmn->next )
+        {
+          if( !(fmn->next->prev = fmn->prev) )
+            freehead = fmn->next;  // We're removing the head node
+        }
+        startfmn->size += fmn->size;
+        memset( fmn, 0, sizeof(struct freememnode) );  // A redundant call, really.
+
+        startfmn = freehead;
+        endfmn = fmn = NULL;        // Break out of current loop
+      }
+      else
+        fmn = fmn->next;
+    }
+
+    if( endfmn )
+      startfmn = startfmn->next;    // endfmn acts as a 'restart' flag here
+  }
 }
 
 void Svcmd_GameMem_f( void )
 {
-	// Give a breakdown of memory
+  // Give a breakdown of memory
 
-	struct freememnode *fmn;
+  struct freememnode *fmn;
 
-	G_Printf( "Game memory status: %i out of %i bytes allocated\n", POOLSIZE - freemem, POOLSIZE );
+  G_Printf( "Game memory status: %i out of %i bytes allocated\n", POOLSIZE - freemem, POOLSIZE );
 
-	for( fmn = freehead; fmn; fmn = fmn->next )
-		G_Printf( "  %dd: %d bytes free.\n", fmn, fmn->size );
-	G_Printf( "Status complete.\n" );
+  for( fmn = freehead; fmn; fmn = fmn->next )
+    G_Printf( "  %dd: %d bytes free.\n", fmn, fmn->size );
+  G_Printf( "Status complete.\n" );
 }