qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-30 16:30:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

better progs access error checking and cleanups resulting from it. Fixes

Browse source 
mega2k and nq.
This commit is contained in:
Bill Currie 2001-03-27 03:57:17 +00:00
parent 5e993575a4
commit f6073d756f
15 changed files with 181 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

49
libs/gamecode/pr_edict.c
View file

@ -62,6 +62,17 @@ int type_size[8] = {
sizeof (void *) / 4
};
char *type_name[8] = {
"void",
"string",
"float",
"vector",
"entity",
"field",
"function",
"pointer",
};
ddef_t *ED_FieldAtOfs (progs_t * pr, int ofs);
qboolean ED_ParseEpair (progs_t * pr, pr_type_t *base, ddef_t *key, char *s);
@ -187,7 +198,7 @@ ED_FieldAtOfs (progs_t * pr, int ofs)
ED_FindField
*/
ddef_t *
ED_FindField (progs_t * pr, char *name)
ED_FindField (progs_t * pr, const char *name)
{
return Hash_Find (pr->field_hash, name);
}
@ -220,15 +231,35 @@ PR_GetGlobalPointer (progs_t *pr, const char *name)
def = PR_FindGlobal (pr, name);
if (def)
return (eval_t*)&pr->pr_globals[def->ofs];
PR_Error (pr, "undefined global %s", name);
return 0;
}
func_t
PR_GetFunctionIndex (progs_t *pr, const char *name)
{
dfunction_t *func = ED_FindFunction (pr, name);
if (func)
return func - pr->pr_functions;
PR_Error (pr, "undefined function %s", name);
return -1;
}
int
PR_GetFieldOffset (progs_t *pr, const char *name)
{
ddef_t *def = ED_FindField (pr, name);
if (def)
return def->ofs;
PR_Error (pr, "undefined field %s", name);
return -1;
}
/*
ED_FindFunction
*/
dfunction_t *
ED_FindFunction (progs_t * pr, char *name)
ED_FindFunction (progs_t * pr, const char *name)
{
return Hash_Find (pr->function_hash, name);
}
@ -1216,3 +1247,17 @@ PR_Error (progs_t *pr, const char *error, ...)
Sys_Error ("%s", string);
}
int
PR_AccessField (progs_t *pr, const char *name, etype_t type,
const char *file, int line)
{
ddef_t *def = ED_FindField (pr, name);
if (!def)
PR_Error (pr, "undefined field %s accessed at %s:%d", name, file, line);
if (def->type != type)
PR_Error (pr, "bad type access to %s as %s (should be %s) at %s:%d",
name, type_name[type], type_name[def->type], file, line);
return def->ofs;
}