cvar: Rename aliasindex to aliases_size and only use it for size of the aliases array...

[xonotic/darkplaces.git] / zone.c

diff --git a/zone.c b/zone.c
index 0254a15e0299337b7cf6b08f1aa5c98cd1abf225..b357a013aeec18f0c7d491a081608c37c6c764c7 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -19,8 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // Z_zone.c
 
-#include "quakedef.h"
-#include "thread.h"
+#include "darkplaces.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -29,11 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 #endif
 
-#ifdef _MSC_VER
-#include <vadefs.h>
-#else
-#include <stdint.h>
-#endif
 #define MEMHEADER_SENTINEL_FOR_ADDRESS(p) ((sentinel_seed ^ (unsigned int) (uintptr_t) (p)) + sentinel_seed)
 unsigned int sentinel_seed;
 
@@ -207,14 +201,14 @@ static void *Clump_AllocBlock(size_t size)
 #if MEMCLUMPING
        if (size <= MEMCLUMPSIZE)
        {
-               int index;
-               unsigned int bit;
-               unsigned int needbits;
-               unsigned int startbit;
-               unsigned int endbit;
-               unsigned int needints;
-               int startindex;
-               int endindex;
+               intptr_t index;
+               size_t bit;
+               size_t needbits;
+               size_t startbit;
+               size_t endbit;
+               size_t needints;
+               intptr_t startindex;
+               intptr_t endindex;
                unsigned int value;
                unsigned int mask;
                unsigned int *array;
@@ -318,10 +312,10 @@ nofreeblock:
 static void Clump_FreeBlock(void *base, size_t size)
 {
 #if MEMCLUMPING
-       unsigned int needbits;
-       unsigned int startbit;
-       unsigned int endbit;
-       unsigned int bit;
+       size_t needbits;
+       size_t startbit;
+       size_t endbit;
+       size_t bit;
        memclump_t **clumpchainpointer;
        memclump_t *clump;
        unsigned char *start = (unsigned char *)base;
@@ -869,8 +863,6 @@ static void MemList_f(cmd_state_t *cmd)
 static void MemStats_f(cmd_state_t *cmd)
 {
        Mem_CheckSentinelsGlobal();
-       R_TextureStats_Print(false, false, true);
-       GL_Mesh_ListVBOs(false);
        Mem_PrintStats();
 }