From 3fe3086cc8c1b967f31b8717140caf1d4875d5b0 Mon Sep 17 00:00:00 2001
From: Steam Deck User <motolegacy.git@gmail.com>
Date: Fri, 31 Mar 2023 11:34:55 -0400
Subject: [PATCH] Misc. Additional Memory optimizations for PSP 1000

---
 source/cl_input.c                   |   3 +
 source/cl_parse.c                   |   4 +-
 source/cl_tent.c                    |  12 +
 source/libpspmath/libpspmath.a      | Bin 53804 -> 66154 bytes
 source/mathlib.h                    |   2 +
 source/menu.c                       |   3 +-
 source/pr_cmds.c                    |  47 ++++
 source/psp/module.h                 |   2 +-
 source/psp/video_hardware_model.cpp |   5 +
 source/psp/video_hardware_warp.cpp  |   7 +
 source/snd_sdl.c                    |   2 +-
 source/sv_main.c                    |   4 +-
 source/zone.c                       | 412 +++++++++++++++-------------
 source/zone.h                       |  20 +-
 14 files changed, 323 insertions(+), 200 deletions(-)

diff --git a/source/cl_input.c b/source/cl_input.c
index 2fdea60..0c13bdf 100644
--- a/source/cl_input.c
+++ b/source/cl_input.c
@@ -320,12 +320,15 @@ Send the intended movement message to the server
 */
 
 extern cvar_t waypoint_mode;
+qboolean in_game;
 float crosshair_opacity;
 void CL_BaseMove (usercmd_t *cmd)
 {
 	if (cls.signon != SIGNONS)//BLUBS CHANGED HERE
 		return;
 
+	in_game = true;
+
 	CL_AdjustAngles ();
 
 	Q_memset (cmd, 0, sizeof(*cmd));
diff --git a/source/cl_parse.c b/source/cl_parse.c
index 3ee3f27..5218110 100644
--- a/source/cl_parse.c
+++ b/source/cl_parse.c
@@ -912,7 +912,7 @@ void CL_ParseClientdata (int bits)
 
 
 	if (bits & SU_WEAPON)
-		i = MSG_ReadByte ();
+		i = MSG_ReadShort ();
 	else
 		i = 0;
 
@@ -995,7 +995,7 @@ void CL_ParseClientdata (int bits)
 	if (cl.progress_bar != i)
 		cl.progress_bar = i;
 
-	i = MSG_ReadByte ();
+	i = MSG_ReadShort ();
 	if (cl.stats[STAT_WEAPON2] != i)
 		cl.stats[STAT_WEAPON2] = i;
 
diff --git a/source/cl_tent.c b/source/cl_tent.c
index 662fb17..d4bad1b 100644
--- a/source/cl_tent.c
+++ b/source/cl_tent.c
@@ -41,9 +41,21 @@ void CL_InitTEnts (void)
 {
 	cl_sfx_r_exp3 = S_PrecacheSound ("sounds/weapons/r_exp3.wav");
 	cl_sfx_step[0] = S_PrecacheSound ("sounds/player/footstep1.wav");
+
+#ifdef SLIM
+
 	cl_sfx_step[1] = S_PrecacheSound ("sounds/player/footstep2.wav");
 	cl_sfx_step[2] = S_PrecacheSound ("sounds/player/footstep3.wav");
 	cl_sfx_step[3] = S_PrecacheSound ("sounds/player/footstep4.wav");
+
+#else
+
+	cl_sfx_step[1] = S_PrecacheSound ("sounds/player/footstep1.wav");
+	cl_sfx_step[2] = S_PrecacheSound ("sounds/player/footstep1.wav");
+	cl_sfx_step[3] = S_PrecacheSound ("sounds/player/footstep1.wav");
+
+#endif // SLIM
+
 }
 
 /*
diff --git a/source/libpspmath/libpspmath.a b/source/libpspmath/libpspmath.a
index 5f165f7e349858fb794597de432273a9607422d3..d928edb60cc716401a50672d334fa1fb2ac8da0b 100644
GIT binary patch
literal 66154
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
S_+?;JG(VSf$<1MQ{r?9E?`qNj

literal 53804
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
S$pC)1yB9Op8<3BKkpB-zbeSjs

diff --git a/source/mathlib.h b/source/mathlib.h
index 73e87ce..2d8ee41 100644
--- a/source/mathlib.h
+++ b/source/mathlib.h
@@ -68,6 +68,8 @@ extern	int nanmask;
 //#endif
 
 #define CLAMP(min, x, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x)) //johnfitz
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#define MAX(a,b) (((a)>(b))?(a):(b))
 
 #define lhrandom(MIN,MAX) ((rand() & 32767) * (((MAX)-(MIN)) * (1.0f / 32767.0f)) + (MIN))
 
diff --git a/source/menu.c b/source/menu.c
index f1c6322..70b3cc1 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -773,13 +773,14 @@ char *exitMessage [] =
   "   X :Yes    O : No       "
 };
 
-
+extern qboolean in_game;
 void M_Menu_Exit_f (void)
 {
 	wasInMenus = (key_dest == key_menu_pause);
 	key_dest = key_menu_pause;
 	m_state = m_exit;
 	m_entersound = true;
+	in_game = false;
 }
 
 
diff --git a/source/pr_cmds.c b/source/pr_cmds.c
index ec28795..d17afdc 100644
--- a/source/pr_cmds.c
+++ b/source/pr_cmds.c
@@ -615,6 +615,29 @@ void PF_sound (void)
 	volume = G_FLOAT(OFS_PARM3) * 255;
 	attenuation = G_FLOAT(OFS_PARM4);
 
+	// AWFUL AWFUL HACK for limiting zombie sound variations
+#ifndef SLIM
+	char* s = sample;
+
+	if (s[strlen(s) - 6] == 'r' || s[strlen(s) - 6] == 'd' || s[strlen(s) - 6] == 'a' ||
+	s[strlen(s) - 6] == 't' || s[strlen(s) - 6] == 'w') {
+		if (s[strlen(s) - 5] == '1' || s[strlen(s) - 5] == '2' || 
+		s[strlen(s) - 5] == '3' || s[strlen(s) - 5] == '4' || 
+		s[strlen(s) - 5] == '5' || s[strlen(s) - 5] == '6' ||
+		s[strlen(s) - 5] == '7' || s[strlen(s) - 5] == '8' ||
+		s[strlen(s) - 5] == '9') {
+
+			if (s[strlen(s) - 6] == 'r') {
+				sample[strlen(sample) - 6] = 'w';
+				sample[strlen(sample) - 5] = '1';
+			} else {
+				sample[strlen(sample) - 5] = '0';
+			}
+		}
+	}
+
+#endif // SLIM
+
 	if (volume < 0 || volume > 255)
 		Sys_Error ("SV_StartSound: volume = %i", volume);
 
@@ -2416,6 +2439,30 @@ void PF_precache_sound (void)
 	G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
 	PR_CheckEmptyString (s);
 
+	// AWFUL AWFUL HACK for limiting zombie sound variations
+#ifndef SLIM
+
+	if (s[strlen(s) - 6] == 'r' || s[strlen(s) - 6] == 'd' || s[strlen(s) - 6] == 'a' ||
+	s[strlen(s) - 6] == 't' || s[strlen(s) - 6] == 'w') {
+		if (s[strlen(s) - 5] == '1' || s[strlen(s) - 5] == '2' || 
+		s[strlen(s) - 5] == '3' || s[strlen(s) - 5] == '4' || 
+		s[strlen(s) - 5] == '5' || s[strlen(s) - 5] == '6' ||
+		s[strlen(s) - 5] == '7' || s[strlen(s) - 5] == '8' ||
+		s[strlen(s) - 5] == '9') {
+
+			if (s[strlen(s) - 6] == 'r') {
+				s[strlen(s) - 6] = 'w';
+				s[strlen(s) - 5] = '1';
+			} else 
+				s[strlen(s) - 5] = '0';
+		}
+	}
+
+	
+
+#endif // SLIM
+
+
 	for (i=0 ; i<MAX_SOUNDS ; i++)
 	{
 		if (!sv.sound_precache[i])
diff --git a/source/psp/module.h b/source/psp/module.h
index 9d9440a..9f02505 100644
--- a/source/psp/module.h
+++ b/source/psp/module.h
@@ -1,5 +1,5 @@
 #ifdef SLIM
 #define PSP_HEAP_SIZE_MB 42
 #else
-#define PSP_HEAP_SIZE_MB 18
+#define PSP_HEAP_SIZE_MB 7
 #endif
\ No newline at end of file
diff --git a/source/psp/video_hardware_model.cpp b/source/psp/video_hardware_model.cpp
index f3b85c5..1025720 100644
--- a/source/psp/video_hardware_model.cpp
+++ b/source/psp/video_hardware_model.cpp
@@ -2128,12 +2128,17 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype)
 			// HACK HACK HACK
 			sprintf (model2, "%s.mdl_%i", model, i);
 
+#ifdef SLIM
+
 			pheader->gl_texturenum[i][0] = 
 			pheader->gl_texturenum[i][1] = 
 			pheader->gl_texturenum[i][2] = 
 			pheader->gl_texturenum[i][3] = loadtextureimage (model2, 0, 0, qtrue, GU_LINEAR);
 
 			if (pheader->gl_texturenum[i][0] == 0)// did not find a matching TGA...
+
+#endif // SLIM
+
 			{
 				sprintf (name, "%s_%i", loadmodel->name, i);
 				if(mod_h2)
diff --git a/source/psp/video_hardware_warp.cpp b/source/psp/video_hardware_warp.cpp
index 5214ce7..d0ba6ce 100644
--- a/source/psp/video_hardware_warp.cpp
+++ b/source/psp/video_hardware_warp.cpp
@@ -876,6 +876,9 @@ R_LoadSkys
 extern int nonetexture;
 void Sky_LoadSkyBox (char *name)
 {
+
+#ifdef SLIM
+
 	if (strcmp(skybox_name, name) == 0)
 		return; //no change
 
@@ -899,6 +902,7 @@ void Sky_LoadSkyBox (char *name)
     for (int i = 0; i < 6; i++)
     {
         int mark = Hunk_LowMark ();
+
 		if(!(skyimage[i] = loadtextureimage (va("gfx/env/%s%s", name, suf[i]), 0, 0, qfalse, GU_LINEAR)) &&
            !(skyimage[i] = loadtextureimage (va("gfx/env/%s_%s", name, suf[i]), 0, 0, qfalse, GU_LINEAR)))
 		{
@@ -912,6 +916,9 @@ void Sky_LoadSkyBox (char *name)
         Hunk_FreeToLowMark (mark);
     }
     strcpy(skybox_name, name);
+
+#endif // SLIM
+
 }
 
 /*
diff --git a/source/snd_sdl.c b/source/snd_sdl.c
index 0788538..f7b7e57 100644
--- a/source/snd_sdl.c
+++ b/source/snd_sdl.c
@@ -40,7 +40,7 @@ qboolean SNDDMA_Init(void)
 			return 0;
 	}
 	desired.channels = 2;
-	desired.samples = 512;
+	desired.samples = 48;
 	desired.callback = paint_audio;
 
 	/* Open the audio device */
diff --git a/source/sv_main.c b/source/sv_main.c
index 3661791..f84e728 100644
--- a/source/sv_main.c
+++ b/source/sv_main.c
@@ -749,7 +749,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
 	if (bits & SU_WEAPONSKIN)
 		MSG_WriteByte (msg, ent->v.weaponskin);
 	if (bits & SU_WEAPON)
-		MSG_WriteByte (msg, SV_ModelIndex(pr_strings+ent->v.weaponmodel));
+		MSG_WriteShort (msg, SV_ModelIndex(pr_strings+ent->v.weaponmodel));
 
 	if (bits & SU_GRENADES)
 		MSG_WriteLong (msg, ent->v.grenades);
@@ -767,7 +767,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
 	MSG_WriteByte (msg, ent->v.x2_icon);
 	MSG_WriteByte (msg, ent->v.insta_icon);
 	MSG_WriteByte (msg, ent->v.progress_bar);
-	MSG_WriteByte (msg, SV_ModelIndex(pr_strings+ent->v.weapon2model));
+	MSG_WriteShort (msg, SV_ModelIndex(pr_strings+ent->v.weapon2model));
 	MSG_WriteByte (msg, ent->v.weapon2skin);
 	MSG_WriteByte (msg, ent->v.weapon2frame);
 	MSG_WriteByte (msg, ent->v.currentmag2);
diff --git a/source/zone.c b/source/zone.c
index 5794b6c..fef31d0 100644
--- a/source/zone.c
+++ b/source/zone.c
@@ -1,5 +1,7 @@
 /*
-Copyright (C) 1996-1997 Id Software, Inc.
+Copyright (C) 1996-2001 Id Software, Inc.
+Copyright (C) 2002-2009 John Fitzgibbons and others
+Copyright (C) 2010-2014 QuakeSpasm developers
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -17,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// Z_zone.c
+// zone.c
 
 #include "quakedef.h"
 
@@ -29,17 +31,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef struct memblock_s
 {
-	int		size;           // including the header and possibly tiny fragments
-	int     tag;            // a tag of 0 is a free block
-	int     id;        		// should be ZONEID
-	struct memblock_s       *next, *prev;
-	int		pad;			// pad to 64 bit boundary
+	int	size;		// including the header and possibly tiny fragments
+	int	tag;		// a tag of 0 is a free block
+	int	id;		// should be ZONEID
+	int	pad;		// pad to 64 bit boundary
+	struct	memblock_s	*next, *prev;
 } memblock_t;
 
 typedef struct
 {
 	int		size;		// total bytes malloced, including header
-	memblock_t	blocklist;		// start / end cap for linked list
+	memblock_t	blocklist;	// start / end cap for linked list
 	memblock_t	*rover;
 } memzone_t;
 
@@ -443,6 +445,7 @@ void *Q_strdup (const char *str)
 	return p;
 }
 
+
 /*
 ==============================================================================
 
@@ -458,34 +461,7 @@ all big things are allocated on the hunk.
 ==============================================================================
 */
 
-memzone_t	*mainzone;
-
-void Z_ClearZone (memzone_t *zone, int size);
-
-
-/*
-========================
-Z_ClearZone
-========================
-*/
-void Z_ClearZone (memzone_t *zone, int size)
-{
-	memblock_t	*block;
-
-// set the entire zone to one free block
-
-	zone->blocklist.next = zone->blocklist.prev = block =
-		(memblock_t *)( (byte *)zone + sizeof(memzone_t) );
-	zone->blocklist.tag = 1;	// in use block
-	zone->blocklist.id = 0;
-	zone->blocklist.size = 0;
-	zone->rover = block;
-
-	block->prev = block->next = &zone->blocklist;
-	block->tag = 0;			// free block
-	block->id = ZONEID;
-	block->size = size - sizeof(memzone_t);
-}
+static memzone_t	*mainzone;
 
 
 /*
@@ -501,12 +477,8 @@ void Z_Free (void *ptr)
 		Sys_Error ("Z_Free: NULL pointer");
 
 	block = (memblock_t *) ( (byte *)ptr - sizeof(memblock_t));
-
 	if (block->id != ZONEID)
-    {
-	Con_DPrintf("Z_Free: freed a pointer without ZONEID\n");
-	return;
-    }
+		Sys_Error ("Z_Free: freed a pointer without ZONEID");
 	if (block->tag == 0)
 		Sys_Error ("Z_Free: freed a freed pointer");
 
@@ -535,28 +507,10 @@ void Z_Free (void *ptr)
 }
 
 
-/*
-========================
-Z_Malloc
-========================
-*/
-void *Z_Malloc (int size)
-{
-	void	*buf;
-
-Z_CheckHeap ();	// DEBUG
-	buf = Z_TagMalloc (size, 1);
-	if (!buf)
-		Sys_Error ("Z_Malloc: failed on allocation of %i bytes",size);
-	Q_memset (buf, 0, size);
-
-	return buf;
-}
-
 void *Z_TagMalloc (int size, int tag)
 {
 	int		extra;
-	memblock_t	*start, *rover, *new, *base;
+	memblock_t	*start, *rover, *newblock, *base;
 
 	if (!tag)
 		Sys_Error ("Z_TagMalloc: tried to use a 0 tag");
@@ -588,14 +542,14 @@ void *Z_TagMalloc (int size, int tag)
 	extra = base->size - size;
 	if (extra >  MINFRAGMENT)
 	{	// there will be a free fragment after the allocated block
-		new = (memblock_t *) ((byte *)base + size );
-		new->size = extra;
-		new->tag = 0;			// free block
-		new->prev = base;
-		new->id = ZONEID;
-		new->next = base->next;
-		new->next->prev = new;
-		base->next = new;
+		newblock = (memblock_t *) ((byte *)base + size );
+		newblock->size = extra;
+		newblock->tag = 0;			// free block
+		newblock->prev = base;
+		newblock->id = ZONEID;
+		newblock->next = base->next;
+		newblock->next->prev = newblock;
+		base->next = newblock;
 		base->size = size;
 	}
 
@@ -611,6 +565,92 @@ void *Z_TagMalloc (int size, int tag)
 	return (void *) ((byte *)base + sizeof(memblock_t));
 }
 
+/*
+========================
+Z_CheckHeap
+========================
+*/
+void Z_CheckHeap (void)
+{
+	memblock_t	*block;
+
+	for (block = mainzone->blocklist.next ; ; block = block->next)
+	{
+		if (block->next == &mainzone->blocklist)
+			break;			// all blocks have been hit
+		if ( (byte *)block + block->size != (byte *)block->next)
+			Sys_Error ("Z_CheckHeap: block size does not touch the next block");
+		if ( block->next->prev != block)
+			Sys_Error ("Z_CheckHeap: next block doesn't have proper back link");
+		if (!block->tag && !block->next->tag)
+			Sys_Error ("Z_CheckHeap: two consecutive free blocks");
+	}
+}
+
+
+/*
+========================
+Z_Malloc
+========================
+*/
+void *Z_Malloc (int size)
+{
+	void	*buf;
+
+	Z_CheckHeap ();	// DEBUG
+	buf = Z_TagMalloc (size, 1);
+	if (!buf)
+		Sys_Error ("Z_Malloc: failed on allocation of %i bytes",size);
+	Q_memset (buf, 0, size);
+
+	return buf;
+}
+
+/*
+========================
+Z_Realloc
+========================
+*/
+void *Z_Realloc(void *ptr, int size)
+{
+	int old_size;
+	void *old_ptr;
+	memblock_t *block;
+
+	if (!ptr)
+		return Z_Malloc (size);
+
+	block = (memblock_t *) ((byte *) ptr - sizeof (memblock_t));
+	if (block->id != ZONEID)
+		Sys_Error ("Z_Realloc: realloced a pointer without ZONEID");
+	if (block->tag == 0)
+		Sys_Error ("Z_Realloc: realloced a freed pointer");
+
+	old_size = block->size;
+	old_size -= (4 + (int)sizeof(memblock_t));	/* see Z_TagMalloc() */
+	old_ptr = ptr;
+
+	Z_Free (ptr);
+	ptr = Z_TagMalloc (size, 1);
+	if (!ptr)
+		Sys_Error ("Z_Realloc: failed on allocation of %i bytes", size);
+
+	if (ptr != old_ptr)
+		memmove (ptr, old_ptr, MIN(old_size, size));
+	if (old_size < size)
+		memset ((byte *)ptr + old_size, 0, size - old_size);
+
+	return ptr;
+}
+
+char *Z_Strdup (char *s)
+{
+	size_t sz = strlen(s) + 1;
+	char *ptr = (char *) Z_Malloc (sz);
+	memcpy (ptr, s, sz);
+	return ptr;
+}
+
 
 /*
 ========================
@@ -640,37 +680,16 @@ void Z_Print (memzone_t *zone)
 }
 
 
-/*
-========================
-Z_CheckHeap
-========================
-*/
-void Z_CheckHeap (void)
-{
-	memblock_t	*block;
-
-	for (block = mainzone->blocklist.next ; ; block = block->next)
-	{
-		if (block->next == &mainzone->blocklist)
-			break;			// all blocks have been hit
-		if ( (byte *)block + block->size != (byte *)block->next)
-			Sys_Error ("Z_CheckHeap: block size does not touch the next block\n");
-		if ( block->next->prev != block)
-			Sys_Error ("Z_CheckHeap: next block doesn't have proper back link\n");
-		if (!block->tag && !block->next->tag)
-			Sys_Error ("Z_CheckHeap: two consecutive free blocks\n");
-	}
-}
-
 //============================================================================
 
-#define	HUNK_SENTINAL	0x1df001ed
+#define	HUNK_SENTINEL	0x1df001ed
 
+#define HUNKNAME_LEN	24
 typedef struct
 {
-	int		sentinal;
+	int		sentinel;
 	int		size;		// including sizeof(hunk_t), -1 = not allocated
-	char	name[8];
+	char	name[HUNKNAME_LEN];
 } hunk_t;
 
 byte	*hunk_base;
@@ -682,13 +701,11 @@ int		hunk_high_used;
 qboolean	hunk_tempactive;
 int		hunk_tempmark;
 
-void R_FreeTextures (void);
-
 /*
 ==============
 Hunk_Check
 
-Run consistancy and sentinal trahing checks
+Run consistancy and sentinel trahing checks
 ==============
 */
 void Hunk_Check (void)
@@ -697,9 +714,9 @@ void Hunk_Check (void)
 
 	for (h = (hunk_t *)hunk_base ; (byte *)h != hunk_base + hunk_low_used ; )
 	{
-		if (h->sentinal != HUNK_SENTINAL)
-			Sys_Error ("Hunk_Check: trahsed sentinal");
-		if (h->size < 16 || h->size + (byte *)h - hunk_base > hunk_size)
+		if (h->sentinel != HUNK_SENTINEL)
+			Sys_Error ("Hunk_Check: trashed sentinel");
+		if (h->size < (int) sizeof(hunk_t) || h->size + (byte *)h - hunk_base > hunk_size)
 			Sys_Error ("Hunk_Check: bad size");
 		h = (hunk_t *)((byte *)h+h->size);
 	}
@@ -715,13 +732,11 @@ Otherwise, allocations with the same name will be totaled up before printing.
 */
 void Hunk_Print (qboolean all)
 {
-
 	hunk_t	*h, *next, *endlow, *starthigh, *endhigh;
 	int		count, sum;
 	int		totalblocks;
-	char	name[9];
+	char	name[HUNKNAME_LEN];
 
-	name[8] = 0;
 	count = 0;
 	sum = 0;
 	totalblocks = 0;
@@ -756,9 +771,9 @@ void Hunk_Print (qboolean all)
 	//
 	// run consistancy checks
 	//
-		if (h->sentinal != HUNK_SENTINAL)
-			Sys_Error ("Hunk_Check: trahsed sentinal");
-		if (h->size < 16 || h->size + (byte *)h - hunk_base > hunk_size)
+		if (h->sentinel != HUNK_SENTINEL)
+			Sys_Error ("Hunk_Check: trashed sentinel");
+		if (h->size < (int) sizeof(hunk_t) || h->size + (byte *)h - hunk_base > hunk_size)
 			Sys_Error ("Hunk_Check: bad size");
 
 		next = (hunk_t *)((byte *)h+h->size);
@@ -769,7 +784,7 @@ void Hunk_Print (qboolean all)
 	//
 	// print the single block
 	//
-		memcpy_vfpu(name, h->name, 8);
+		memcpy (name, h->name, HUNKNAME_LEN);
 		if (all)
 			Con_Printf ("%8p :%8i %8s\n",h, h->size, name);
 
@@ -777,7 +792,7 @@ void Hunk_Print (qboolean all)
 	// print the total
 	//
 		if (next == endlow || next == endhigh ||
-		strncmp (h->name, next->name, 8) )
+		    strncmp (h->name, next->name, HUNKNAME_LEN - 1))
 		{
 			if (!all)
 				Con_Printf ("          :%8i %8s (TOTAL)\n",sum, name);
@@ -790,6 +805,17 @@ void Hunk_Print (qboolean all)
 
 	Con_Printf ("-------------------------\n");
 	Con_Printf ("%8i total blocks\n", totalblocks);
+
+}
+
+/*
+===================
+Hunk_Print_f -- johnfitz -- console command to call hunk_print
+===================
+*/
+void Hunk_Print_f (void)
+{
+	Hunk_Print (false);
 }
 
 /*
@@ -801,21 +827,17 @@ void *Hunk_AllocName (int size, char *name)
 {
 	hunk_t	*h;
 
+#ifdef PARANOID
+	Hunk_Check ();
+#endif
+
 	if (size < 0)
-	{
 		Sys_Error ("Hunk_Alloc: bad size: %i", size);
-        //Con_Printf ("Hunk_Alloc: bad size: %i", size);
-		return NULL;
-	}
 
 	size = sizeof(hunk_t) + ((size+15)&~15);
 
 	if (hunk_size - hunk_low_used - hunk_high_used < size)
-	{
-		Sys_Error ("Hunk_Alloc: failed on %i bytes, %s", size, name);
-        //Con_Printf ("Hunk_Alloc: failed on %i bytes",size);
-		return NULL;
-	}
+		Sys_Error ("Hunk_Alloc: failed on %i bytes",size);
 
 	h = (hunk_t *)(hunk_base + hunk_low_used);
 	hunk_low_used += size;
@@ -825,8 +847,8 @@ void *Hunk_AllocName (int size, char *name)
 	memset (h, 0, size);
 
 	h->size = size;
-	h->sentinal = HUNK_SENTINAL;
-	Q_strncpy (h->name, name, 8);
+	h->sentinel = HUNK_SENTINEL;
+	strlcpy(h->name, name, HUNKNAME_LEN);
 
 	return (void *)(h+1);
 }
@@ -897,11 +919,15 @@ void *Hunk_HighAllocName (int size, char *name)
 		hunk_tempactive = false;
 	}
 
+#ifdef PARANOID
+	Hunk_Check ();
+#endif
+
 	size = sizeof(hunk_t) + ((size+15)&~15);
 
 	if (hunk_size - hunk_low_used - hunk_high_used < size)
 	{
-		Con_Printf ("Hunk_HighAlloc: failed on %i bytes, %s\n", size, name);
+		Con_Printf ("Hunk_HighAlloc: failed on %i bytes\n",size);
 		return NULL;
 	}
 
@@ -912,8 +938,8 @@ void *Hunk_HighAllocName (int size, char *name)
 
 	memset (h, 0, size);
 	h->size = size;
-	h->sentinal = HUNK_SENTINAL;
-	Q_strncpy (h->name, name, 8);
+	h->sentinel = HUNK_SENTINEL;
+	strlcpy (h->name, name, HUNKNAME_LEN);
 
 	return (void *)(h+1);
 }
@@ -947,6 +973,14 @@ void *Hunk_TempAlloc (int size)
 	return buf;
 }
 
+char *Hunk_Strdup (char *s, char *name)
+{
+	size_t sz = strlen(s) + 1;
+	char *ptr = (char *) Hunk_AllocName (sz, name);
+	memcpy (ptr, s, sz);
+	return ptr;
+}
+
 /*
 ===============================================================================
 
@@ -955,11 +989,12 @@ CACHE MEMORY
 ===============================================================================
 */
 
+#define CACHENAME_LEN	32
 typedef struct cache_system_s
 {
-	int						size;		// including this header
-	cache_user_t			*user;
-	char					name[16];
+	int			size;		// including this header
+	cache_user_t		*user;
+	char			name[CACHENAME_LEN];
 	struct cache_system_s	*prev, *next;
 	struct cache_system_s	*lru_prev, *lru_next;	// for LRU flushing
 } cache_system_t;
@@ -975,25 +1010,25 @@ Cache_Move
 */
 void Cache_Move ( cache_system_t *c)
 {
-	cache_system_t		*new;
+	cache_system_t		*new_cs;
 
 // we are clearing up space at the bottom, so only allocate it late
-	new = Cache_TryAlloc (c->size, true);
-	if (new)
+	new_cs = Cache_TryAlloc (c->size, true);
+	if (new_cs)
 	{
 //		Con_Printf ("cache_move ok\n");
 
-		Q_memcpy ( new+1, c+1, c->size - sizeof(cache_system_t) );
-		new->user = c->user;
-		Q_memcpy (new->name, c->name, sizeof(new->name));
+		Q_memcpy ( new_cs+1, c+1, c->size - sizeof(cache_system_t) );
+		new_cs->user = c->user;
+		Q_memcpy (new_cs->name, c->name, sizeof(new_cs->name));
 		Cache_Free (c->user);
-		new->user->data = (void *)(new+1);
+		new_cs->user->data = (void *)(new_cs+1);
 	}
 	else
 	{
 //		Con_Printf ("cache_move failed\n");
 
-		Cache_Free (c->user);		// tough luck...
+		Cache_Free (c->user); // tough luck...
 	}
 }
 
@@ -1080,7 +1115,7 @@ Size should already include the header and padding
 */
 cache_system_t *Cache_TryAlloc (int size, qboolean nobottom)
 {
-	cache_system_t	*cs, *new;
+	cache_system_t	*cs, *new_cs;
 
 // is the cache completely empty?
 
@@ -1089,62 +1124,62 @@ cache_system_t *Cache_TryAlloc (int size, qboolean nobottom)
 		if (hunk_size - hunk_high_used - hunk_low_used < size)
 			Sys_Error ("Cache_TryAlloc: %i is greater then free hunk", size);
 
-		new = (cache_system_t *) (hunk_base + hunk_low_used);
-		memset (new, 0, sizeof(*new));
-		new->size = size;
+		new_cs = (cache_system_t *) (hunk_base + hunk_low_used);
+		memset (new_cs, 0, sizeof(*new_cs));
+		new_cs->size = size;
 
-		cache_head.prev = cache_head.next = new;
-		new->prev = new->next = &cache_head;
+		cache_head.prev = cache_head.next = new_cs;
+		new_cs->prev = new_cs->next = &cache_head;
 
-		Cache_MakeLRU (new);
-		return new;
+		Cache_MakeLRU (new_cs);
+		return new_cs;
 	}
 
 // search from the bottom up for space
 
-	new = (cache_system_t *) (hunk_base + hunk_low_used);
+	new_cs = (cache_system_t *) (hunk_base + hunk_low_used);
 	cs = cache_head.next;
 
 	do
 	{
 		if (!nobottom || cs != cache_head.next)
 		{
-			if ( (byte *)cs - (byte *)new >= size)
+			if ( (byte *)cs - (byte *)new_cs >= size)
 			{	// found space
-				memset (new, 0, sizeof(*new));
-				new->size = size;
+				memset (new_cs, 0, sizeof(*new_cs));
+				new_cs->size = size;
 
-				new->next = cs;
-				new->prev = cs->prev;
-				cs->prev->next = new;
-				cs->prev = new;
+				new_cs->next = cs;
+				new_cs->prev = cs->prev;
+				cs->prev->next = new_cs;
+				cs->prev = new_cs;
 
-				Cache_MakeLRU (new);
+				Cache_MakeLRU (new_cs);
 
-				return new;
+				return new_cs;
 			}
 		}
 
 	// continue looking
-		new = (cache_system_t *)((byte *)cs + cs->size);
+		new_cs = (cache_system_t *)((byte *)cs + cs->size);
 		cs = cs->next;
 
 	} while (cs != &cache_head);
 
 // try to allocate one at the very end
-	if ( hunk_base + hunk_size - hunk_high_used - (byte *)new >= size)
+	if ( hunk_base + hunk_size - hunk_high_used - (byte *)new_cs >= size)
 	{
-		memset (new, 0, sizeof(*new));
-		new->size = size;
+		memset (new_cs, 0, sizeof(*new_cs));
+		new_cs->size = size;
 
-		new->next = &cache_head;
-		new->prev = cache_head.prev;
-		cache_head.prev->next = new;
-		cache_head.prev = new;
+		new_cs->next = &cache_head;
+		new_cs->prev = cache_head.prev;
+		cache_head.prev->next = new_cs;
+		cache_head.prev = new_cs;
 
-		Cache_MakeLRU (new);
+		Cache_MakeLRU (new_cs);
 
-		return new;
+		return new_cs;
 	}
 
 	return NULL;		// couldn't allocate
@@ -1160,10 +1195,9 @@ Throw everything out, so new data will be demand cached
 void Cache_Flush (void)
 {
 	while (cache_head.next != &cache_head)
-		Cache_Free ( cache_head.next->user );	// reclaim the space
+		Cache_Free ( cache_head.next->user); // reclaim the space
 }
 
-
 /*
 ============
 Cache_Print
@@ -1174,10 +1208,9 @@ void Cache_Print (void)
 {
 	cache_system_t	*cd;
 
-	Con_Printf("\n===\nCache System Dump\n===\n");
 	for (cd = cache_head.next ; cd != &cache_head ; cd = cd->next)
 	{
-		Con_Printf("* NAME: %s | SIZE: %.2fkB", cd->name, (float)(cd->size/1024));
+		Con_Printf ("%8i : %s\n", cd->size, cd->name);
 	}
 }
 
@@ -1192,16 +1225,6 @@ void Cache_Report (void)
 	Con_DPrintf ("%4.1f megabyte data cache\n", (hunk_size - hunk_high_used - hunk_low_used) / (float)(1024*1024) );
 }
 
-/*
-============
-Cache_Compact
-
-============
-*/
-void Cache_Compact (void)
-{
-}
-
 /*
 ============
 Cache_Init
@@ -1275,7 +1298,7 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name)
 	cache_system_t	*cs;
 
 	if (c->data)
-		Sys_Error ("Cache_Alloc: allready allocated");
+		Sys_Error ("Cache_Alloc: already allocated");
 
 	if (size <= 0)
 		Sys_Error ("Cache_Alloc: size %i", size);
@@ -1288,19 +1311,17 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name)
 		cs = Cache_TryAlloc (size, false);
 		if (cs)
 		{
-			strncpy (cs->name, name, sizeof(cs->name)-1);
+			strlcpy (cs->name, name, CACHENAME_LEN);
 			c->data = (void *)(cs+1);
 			cs->user = c;
 			break;
 		}
 
 	// free the least recently used cahedat
-		if (cache_head.lru_prev == &cache_head) {
-			Cache_Print();
-			Sys_Error ("Cache_Alloc: out of memory");
-		}
-													// not enough memory at all
-		Cache_Free ( cache_head.lru_prev->user );
+		if (cache_head.lru_prev == &cache_head)
+			Sys_Error ("Cache_Alloc: out of memory"); // not enough memory at all
+
+		Cache_Free (cache_head.lru_prev->user);
 	}
 
 	return Cache_Check (c);
@@ -1309,6 +1330,25 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name)
 //============================================================================
 
 
+void Memory_InitZone (memzone_t *zone, int size)
+{
+	memblock_t	*block;
+
+// set the entire zone to one free block
+
+	zone->blocklist.next = zone->blocklist.prev = block =
+		(memblock_t *)( (byte *)zone + sizeof(memzone_t) );
+	zone->blocklist.tag = 1;	// in use block
+	zone->blocklist.id = 0;
+	zone->blocklist.size = 0;
+	zone->rover = block;
+
+	block->prev = block->next = &zone->blocklist;
+	block->tag = 0;			// free block
+	block->id = ZONEID;
+	block->size = size - sizeof(memzone_t);
+}
+
 /*
 ========================
 Memory_Init
@@ -1319,7 +1359,7 @@ void Memory_Init (void *buf, int size)
 	int p;
 	int zonesize = DYNAMIC_SIZE;
 
-	hunk_base = buf;
+	hunk_base = (byte *) buf;
 	hunk_size = size;
 	hunk_low_used = 0;
 	hunk_high_used = 0;
@@ -1333,7 +1373,9 @@ void Memory_Init (void *buf, int size)
 		else
 			Sys_Error ("Memory_Init: you must specify a size in KB after -zone");
 	}
-	mainzone = Hunk_AllocName (zonesize, "zone" );
-	Z_ClearZone (mainzone, zonesize);
+	mainzone = (memzone_t *) Hunk_AllocName (zonesize, "zone" );
+	Memory_InitZone (mainzone, zonesize);
+
+	Cmd_AddCommand ("hunk_print", Hunk_Print_f); //johnfitz
 }
 
diff --git a/source/zone.h b/source/zone.h
index 7808ce5..be7e126 100644
--- a/source/zone.h
+++ b/source/zone.h
@@ -1,5 +1,7 @@
 /*
-Copyright (C) 1996-1997 Id Software, Inc.
+Copyright (C) 1996-2001 Id Software, Inc.
+Copyright (C) 2002-2009 John Fitzgibbons and others
+Copyright (C) 2010-2014 QuakeSpasm developers
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -8,7 +10,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -17,6 +19,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+
+#ifndef __ZZONE_H
+#define __ZZONE_H
+
 /*
  memory allocation
 
@@ -92,16 +98,13 @@ void *Q_strdup (const char *str);		//
 
 void Z_Free (void *ptr);
 void *Z_Malloc (int size);			// returns 0 filled memory
-void *Z_TagMalloc (int size, int tag);
-
-void Z_DumpHeap (void);
-void Z_CheckHeap (void);
-int Z_FreeMemory (void);
+void *Z_Realloc (void *ptr, int size);
+char *Z_Strdup (char *s);
 
 void *Hunk_Alloc (int size);		// returns 0 filled memory
 void *Hunk_AllocName (int size, char *name);
-
 void *Hunk_HighAllocName (int size, char *name);
+char *Hunk_Strdup (char *s, char *name);
 
 int	Hunk_LowMark (void);
 void Hunk_FreeToLowMark (int mark);
@@ -134,3 +137,4 @@ void Cache_Report (void);
 
 void* memcpy_vfpu(void* dst, void* src, unsigned int size);
 
+#endif	/* __ZZONE_H */
\ No newline at end of file