mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-17 22:50:51 +00:00
start implementing dynamic memory for progs
This commit is contained in:
parent
ad8b5670e2
commit
68637eea9e
4 changed files with 75 additions and 1 deletions
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
66
libs/gamecode/engine/pr_zone.c
Normal file
66
libs/gamecode/engine/pr_zone.c
Normal file
|
@ -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);
|
||||
}
|
Loading…
Reference in a new issue