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

do a pre and post pass for maps/mapname.cfg and use maps_default.cfg if

Browse source 
maps/mapname.cfg doesn't exist.
This commit is contained in:
Bill Currie 2002-11-08 02:43:04 +00:00
parent 8d736d7424
commit ec0273e3dc
3 changed files with 74 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

58
libs/gamecode/engine/pr_exec.c
View file

@ -417,21 +417,17 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
break;
case OP_ADDRESS:
if (pr_boundscheck->int_val
&& (OPA.entity_var < 0 || OPA.entity_var >=
pr->pr_edictareasize)) {
PR_RunError (pr, "Progs attempted to address an out of "
"bounds edict");
}
if (pr_boundscheck->int_val
&& (OPA.entity_var == 0 && pr->null_bad)) {
PR_RunError (pr, "assignment to world entity");
}
if (pr_boundscheck->int_val
&& (OPB.integer_var < 0 || OPB.integer_var >=
pr->progs->entityfields)) {
PR_RunError (pr, "Progs attempted to address an invalid "
"field in an edict");
if (pr_boundscheck->int_val) {
if (OPA.entity_var < 0
|| OPA.entity_var >= pr->pr_edictareasize)
PR_RunError (pr, "Progs attempted to address an out "
"of bounds edict");
if (OPA.entity_var == 0 && pr->null_bad)
PR_RunError (pr, "assignment to world entity");
if (OPB.integer_var < 0
|| OPB.integer_var >= pr->progs->entityfields)
PR_RunError (pr, "Progs attempted to address an "
"invalid field in an edict");
}
ed = PROG_TO_EDICT (pr, OPA.entity_var);
OPC.integer_var = &ed->v[OPB.integer_var] - pr->pr_globals;
@ -454,31 +450,27 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_LOAD_FNC:
case OP_LOAD_I:
case OP_LOAD_P:
if (pr_boundscheck->int_val
&& (OPA.entity_var < 0 || OPA.entity_var >=
pr->pr_edictareasize)) {
PR_RunError (pr, "Progs attempted to read an out of "
"bounds edict number");
}
if (pr_boundscheck->int_val
&& (OPB.integer_var < 0 || OPB.integer_var >=
pr->progs->entityfields)) {
PR_RunError (pr, "Progs attempted to read an invalid "
"field in an edict");
if (pr_boundscheck->int_val) {
if (OPA.entity_var < 0
|| OPA.entity_var >= pr->pr_edictareasize)
PR_RunError (pr, "Progs attempted to read an out of "
"bounds edict number");
if (OPB.integer_var < 0
|| OPB.integer_var >= pr->progs->entityfields)
PR_RunError (pr, "Progs attempted to read an invalid "
"field in an edict");
}
ed = PROG_TO_EDICT (pr, OPA.entity_var);
OPC.integer_var = ed->v[OPB.integer_var].integer_var;
break;
case OP_LOAD_V:
if (pr_boundscheck->int_val
&& (OPA.entity_var < 0 || OPA.entity_var >=
pr->pr_edictareasize)) {
if (pr_boundscheck->int_val) {
if (OPA.entity_var < 0
|| OPA.entity_var >= pr->pr_edictareasize)
PR_RunError (pr, "Progs attempted to read an out of "
"bounds edict number");
}
if (pr_boundscheck->int_val
&& (OPB.integer_var < 0
|| OPB.integer_var + 2 >= pr->progs->entityfields)) {
if (OPB.integer_var < 0
|| OPB.integer_var + 2 >= pr->progs->entityfields)
PR_RunError (pr, "Progs attempted to read an invalid "
"field in an edict");
}