From 02e021a958c7d5d57c06dd43fae3f0cb22b68ab0 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 18 Jul 2001 02:21:57 +0000 Subject: [PATCH] get the progs /loader/ name and prototype sorted out properly --- include/QF/progs.h | 4 +++- libs/gamecode/pr_edict.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/QF/progs.h b/include/QF/progs.h index ba2e2168a..7d4e0df72 100644 --- a/include/QF/progs.h +++ b/include/QF/progs.h @@ -70,7 +70,7 @@ void PR_Init_Cvars (void); void PR_PrintStatement (progs_t * pr, dstatement_t *s); void PR_ExecuteProgram (progs_t *pr, func_t fnum); -progs_t *PR_LoadProgsFile (const char *progsname); +void PR_LoadProgsFile (progs_t *pr, const char *progsname); void PR_LoadProgs (progs_t *pr, const char *progsname); void PR_LoadStrings (progs_t *pr); void PR_LoadDebug (progs_t *pr); @@ -137,6 +137,7 @@ extern int type_size[8]; typedef void (*builtin_t) (progs_t *pr); ddef_t *PR_FindGlobal (progs_t *pr, const char *name); +ddef_t *ED_GlobalAtOfs (progs_t * pr, int ofs); pr_type_t *PR_GetGlobalPointer (progs_t *pr, const char *name); func_t PR_GetFunctionIndex (progs_t *pr, const char *name); @@ -198,6 +199,7 @@ typedef struct strref_s { struct progs_s { const char *progs_name; dprograms_t *progs; + int progs_size; struct hashtab_s *function_hash; struct hashtab_s *global_hash; diff --git a/libs/gamecode/pr_edict.c b/libs/gamecode/pr_edict.c index 1b204802f..decbabe2f 100644 --- a/libs/gamecode/pr_edict.c +++ b/libs/gamecode/pr_edict.c @@ -1006,7 +1006,7 @@ var_get_key (void *d, void *_pr) } void -_PR_LoadProgs (progs_t * pr, const char *progsname) +PR_LoadProgsFile (progs_t * pr, const char *progsname) { int i; @@ -1017,6 +1017,7 @@ _PR_LoadProgs (progs_t * pr, const char *progsname) if (!pr->progs) return; + pr->progs_size = com_filesize; Con_DPrintf ("Programs occupy %iK.\n", com_filesize / 1024); // store prog crc @@ -1119,7 +1120,7 @@ PR_LoadProgs (progs_t * pr, const char *progsname) int i; dstatement_t *st; - _PR_LoadProgs (pr, progsname); + PR_LoadProgsFile (pr, progsname); if (!pr->progs) return;