From 6f590ff9d0ee3c0d4120e22ada9061d422a67820 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 1 Mar 2001 23:03:40 +0000
Subject: [PATCH] forgot to change ev_function to ev_func in pr_edict and
pr_exec was using the wrong time. weaponframe still not fixed, but static
entities were fixed in the previous checkin
---
libs/gamecode/pr_edict.c | 8 ++++----
libs/gamecode/pr_exec.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libs/gamecode/pr_edict.c b/libs/gamecode/pr_edict.c
index b1cdc3e0a..0fef83d7f 100644
--- a/libs/gamecode/pr_edict.c
+++ b/libs/gamecode/pr_edict.c
@@ -284,7 +284,7 @@ PR_ValueString (progs_t * pr, etype_t type, eval_t *val)
snprintf (line, sizeof (line), "entity %i",
NUM_FOR_EDICT (pr, PROG_TO_EDICT (pr, val->edict)));
break;
- case ev_function:
+ case ev_func:
f = pr->pr_functions + val->function;
snprintf (line, sizeof (line), "%s()",
PR_GetString (pr, f->s_name));
@@ -339,7 +339,7 @@ PR_UglyValueString (progs_t * pr, etype_t type, eval_t *val)
snprintf (line, sizeof (line), "%i",
NUM_FOR_EDICT (pr, PROG_TO_EDICT (pr, val->edict)));
break;
- case ev_function:
+ case ev_func:
f = pr->pr_functions + val->function;
snprintf (line, sizeof (line), "%s", PR_GetString (pr, f->s_name));
break;
@@ -730,7 +730,7 @@ ED_ParseEpair (progs_t * pr, pr_type_t *base, ddef_t *key, char *s)
d->_int = G_INT (pr, def->ofs);
break;
- case ev_function:
+ case ev_func:
func = ED_FindFunction (pr, s);
if (!func) {
Con_Printf ("Can't find function %s\n", s);
@@ -1012,7 +1012,7 @@ PR_LoadProgs (progs_t * pr, char *progsname)
def = PR_FindGlobal (pr, "self");
if (!def)
PR_Error (pr, "%s: undefined symbol: self", progsname);
- pr->globals.self = &pr->pr_globals[def->ofs].edict_var;
+ pr->globals.self = &pr->pr_globals[def->ofs].entity_var;
if (!(pr->fields.nextthink = FindFieldOffset (pr, "nextthink")))
PR_Error (pr, "%s: undefined field: nextthink", progsname);
if (!(pr->fields.frame = FindFieldOffset (pr, "frame")))
diff --git a/libs/gamecode/pr_exec.c b/libs/gamecode/pr_exec.c
index ac9b7198f..1c25b49ea 100644
--- a/libs/gamecode/pr_exec.c
+++ b/libs/gamecode/pr_exec.c
@@ -676,7 +676,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
break;
case OP_STATE:
ed = PROG_TO_EDICT (pr, *pr->globals.self);
- ed->v[pr->fields.nextthink].float_var = *pr->time + 0.1;
+ ed->v[pr->fields.nextthink].float_var = *pr->globals.time + 0.1;
ed->v[pr->fields.frame].float_var = E_OPA->_float;
ed->v[pr->fields.think].func_var = E_OPB->function;
break;