qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-30 08:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

make the bad builtin number a warning and provide a suitable function in

Browse source 
case the function is called: allows progs with bad (but unused) builtins
to run anyway
This commit is contained in:
Bill Currie 2004-01-06 03:18:44 +00:00
parent 6f1dd54e99
commit fbe6c2f631
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libs/gamecode/engine/pr_builtins.c
View file

@ -108,6 +108,19 @@ PR_FindBuiltin (progs_t *pr, const char *name)
return (builtin_t *) Hash_Find (pr->builtin_hash, name); return (builtin_t *) Hash_Find (pr->builtin_hash, name);
} }
static void
bi_no_function (progs_t *pr)
{
// no need for checking: the /only/ way to get here is via a function
// descriptor with a bad builtin number
dstatement_t *st = pr->pr_statements + pr->pr_xstatement;
dfunction_t *func = pr->pr_functions + G_FUNCTION (pr, st->a);
const char *bi_name = PR_GetString (pr, func->s_name);
int ind = -func->first_statement;
PR_RunError (pr, "Bad builtin called: %s = #%d", bi_name, ind);
}
int int
PR_RelocateBuiltins (progs_t *pr) PR_RelocateBuiltins (progs_t *pr)
{ {
@ -115,6 +128,7 @@ PR_RelocateBuiltins (progs_t *pr)
int bad = 0; int bad = 0;
dfunction_t *func; dfunction_t *func;
builtin_t *bi; builtin_t *bi;
builtin_proc proc;
const char *bi_name; const char *bi_name;
for (i = 1; i < pr->progs->numfunctions; i++) { for (i = 1; i < pr->progs->numfunctions; i++) {
@ -137,12 +151,13 @@ PR_RelocateBuiltins (progs_t *pr)
} }
ind = -func->first_statement; ind = -func->first_statement;
if (ind >= pr->numbuiltins || !(bi = pr->builtins[ind]) || !bi->proc) { if (ind >= pr->numbuiltins || !(bi = pr->builtins[ind])
Sys_Printf ("Bad builtin call number: %s = #%d\n", bi_name, ind); || !(proc = bi->proc)) {
bad = 1; Sys_DPrintf ("WARNING: Bad builtin call number: %s = #%d\n",
continue; bi_name, ind);
proc = bi_no_function;
} }
((bfunction_t *) func)->func = bi->proc; ((bfunction_t *) func)->func = proc;
} }
return !bad; return !bad;
} }