From 68637eea9e16fc6ec70057ab818439459b494301 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 23 Jan 2002 22:35:48 +0000
Subject: [PATCH] start implementing dynamic memory for progs

---
 include/QF/progs.h               |  6 +++
 libs/gamecode/engine/Makefile.am |  2 +-
 libs/gamecode/engine/pr_edict.c  |  2 +
 libs/gamecode/engine/pr_zone.c   | 66 ++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 libs/gamecode/engine/pr_zone.c

diff --git a/include/QF/progs.h b/include/QF/progs.h
index 1df9856d8..ce4ab460b 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -131,6 +131,10 @@ int NUM_FOR_BAD_EDICT(progs_t *pr, edict_t *e);
 #define	G_STRING(p,o)	PR_GetString (p, G_var (p, o, string))
 #define	G_FUNCTION(p,o)	G_var (p, o, func)
 
+#define RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].integer_var = PR_SetString((p), s))
+#define RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].integer_var = EDICT_TO_PROG(p, e))
+
+
 #define E_var(e,o,t)	((e)->v[o].t##_var)
 
 #define	E_FLOAT(e,o)	E_var (e, o, float)
@@ -228,6 +232,8 @@ struct progs_s {
 	dprograms_t		*progs;
 	int				progs_size;
 
+	struct memzone_s *zone;
+
 	struct hashtab_s *builtin_hash;
 	struct hashtab_s *function_hash;
 	struct hashtab_s *global_hash;
diff --git a/libs/gamecode/engine/Makefile.am b/libs/gamecode/engine/Makefile.am
index 867de24ec..34852e8f0 100644
--- a/libs/gamecode/engine/Makefile.am
+++ b/libs/gamecode/engine/Makefile.am
@@ -6,4 +6,4 @@ lib_LTLIBRARIES=	libQFgamecode.la
 
 libQFgamecode_la_LDFLAGS=	-version-info 1:0:0
 libQFgamecode_la_SOURCES= \
-	pr_edict.c pr_debug.c pr_exec.c pr_opcode.c pr_strings.c
+	pr_edict.c pr_debug.c pr_exec.c pr_opcode.c pr_strings.c pr_zone.c
diff --git a/libs/gamecode/engine/pr_edict.c b/libs/gamecode/engine/pr_edict.c
index 525ea95b4..d17461f32 100644
--- a/libs/gamecode/engine/pr_edict.c
+++ b/libs/gamecode/engine/pr_edict.c
@@ -1110,6 +1110,8 @@ PR_LoadProgsFile (progs_t * pr, const char *progsname)
 
 	pr->progs_name = progsname;	//XXX is this safe?
 
+	pr->zone = 0;		// caller sets up afterwards
+
 	pr->pr_functions =
 		(dfunction_t *) ((byte *) pr->progs + pr->progs->ofs_functions);
 	pr->pr_strings = (char *) pr->progs + pr->progs->ofs_strings;
diff --git a/libs/gamecode/engine/pr_zone.c b/libs/gamecode/engine/pr_zone.c
new file mode 100644
index 000000000..9256b867d
--- /dev/null
+++ b/libs/gamecode/engine/pr_zone.c
@@ -0,0 +1,66 @@
+/*
+	pr_zone.c
+
+	(description)
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	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.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+static const char rcsid[] = 
+	"$Id$";
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#include <stdarg.h>
+
+#include "QF/cvar.h"
+#include "QF/mathlib.h"
+#include "QF/progs.h"
+#include "QF/sys.h"
+#include "QF/zone.h"
+
+#include "compat.h"
+
+void
+PR_Zone_Init (progs_t *pr, int size)
+{
+	Z_ClearZone (pr->zone, size);
+}
+
+void
+PR_Zone_Free (progs_t *pr, void *ptr)
+{
+	Z_Free (pr->zone, ptr);
+}
+
+void
+PR_Zone_Malloc (progs_t *pr, int size)
+{
+	Z_Malloc (pr->zone, size);
+}