From 84ea81a77063f5a7efc82533caeea9ac441b71c3 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 12 Sep 2003 23:12:21 +0000 Subject: [PATCH] fix E_POINTER and E_FUNCTION --- include/QF/progs.h | 4 ++-- nq/include/sv_progs.h | 10 +++++----- qw/include/sv_progs.h | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/QF/progs.h b/include/QF/progs.h index b134df92d..0a92d8a57 100644 --- a/include/QF/progs.h +++ b/include/QF/progs.h @@ -169,8 +169,8 @@ qboolean PR_EdictValid (progs_t *pr, int e); #define E_UINT(e,o) E_var (e, o, uinteger) #define E_VECTOR(e,o) E_var (e, o, vector) #define E_STRING(e,o) E_var (e, o, string) -#define E_FUNCTION(p) E_var (p, o, func) -#define E_POINTER(p) E_var (p, o, pointer) +#define E_FUNCTION(p,o) E_var (p, o, func) +#define E_POINTER(p,o) E_var (p, o, pointer) #define E_GSTRING(p,e,o) (PR_GetString (p, E_STRING (e, o))) diff --git a/nq/include/sv_progs.h b/nq/include/sv_progs.h index ba099d44a..4b73a1393 100644 --- a/nq/include/sv_progs.h +++ b/nq/include/sv_progs.h @@ -211,9 +211,9 @@ sv_pr_touch (edict_t *self, edict_t *other) *sv_globals.self = EDICT_TO_PROG (&sv_pr_state, self); *sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other); if ((this = sv_pr_state.fields.this) != -1) { - P_INT (&sv_pr_state, 0) = E_var (self, this, integer); + P_INT (&sv_pr_state, 0) = E_POINTER (self, this); P_INT (&sv_pr_state, 1) = 0; - P_INT (&sv_pr_state, 2) = E_var (other, this, integer); + P_INT (&sv_pr_state, 2) = E_POINTER (other, this); } PR_ExecuteProgram (&sv_pr_state, SVfunc (self, touch)); } @@ -231,7 +231,7 @@ sv_pr_think (edict_t *self) *sv_globals.self = EDICT_TO_PROG (&sv_pr_state, self); *sv_globals.other = 0; if ((this = sv_pr_state.fields.this) != -1) { - P_INT (&sv_pr_state, 0) = E_var (self, this, integer); + P_INT (&sv_pr_state, 0) = E_POINTER (self, this); P_INT (&sv_pr_state, 1) = 0; P_INT (&sv_pr_state, 2) = 0; } @@ -246,9 +246,9 @@ sv_pr_blocked (edict_t *self, edict_t *other) *sv_globals.self = EDICT_TO_PROG (&sv_pr_state, self); *sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other); if ((this = sv_pr_state.fields.this) != -1) { - P_INT (&sv_pr_state, 0) = E_var (self, this, integer); + P_INT (&sv_pr_state, 0) = E_POINTER (self, this); P_INT (&sv_pr_state, 1) = 0; - P_INT (&sv_pr_state, 2) = E_var (other, this, integer); + P_INT (&sv_pr_state, 2) = E_POINTER (other, this); } PR_ExecuteProgram (&sv_pr_state, SVfunc (self, blocked)); } diff --git a/qw/include/sv_progs.h b/qw/include/sv_progs.h index 995b9f88b..c14bf08ef 100644 --- a/qw/include/sv_progs.h +++ b/qw/include/sv_progs.h @@ -192,9 +192,9 @@ sv_pr_touch (edict_t *self, edict_t *other) *sv_globals.self = EDICT_TO_PROG (&sv_pr_state, self); *sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other); if ((this = sv_pr_state.fields.this) != -1) { - P_INT (&sv_pr_state, 0) = E_var (self, this, integer); + P_INT (&sv_pr_state, 0) = E_POINTER (self, this); P_INT (&sv_pr_state, 1) = 0; - P_INT (&sv_pr_state, 2) = E_var (other, this, integer); + P_INT (&sv_pr_state, 2) = E_POINTER (other, this); } PR_ExecuteProgram (&sv_pr_state, SVfunc (self, touch)); } @@ -212,7 +212,7 @@ sv_pr_think (edict_t *self) *sv_globals.self = EDICT_TO_PROG (&sv_pr_state, self); *sv_globals.other = 0; if ((this = sv_pr_state.fields.this) != -1) { - P_INT (&sv_pr_state, 0) = E_var (self, this, integer); + P_INT (&sv_pr_state, 0) = E_POINTER (self, this); P_INT (&sv_pr_state, 1) = 0; P_INT (&sv_pr_state, 2) = 0; } @@ -227,9 +227,9 @@ sv_pr_blocked (edict_t *self, edict_t *other) *sv_globals.self = EDICT_TO_PROG (&sv_pr_state, self); *sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other); if ((this = sv_pr_state.fields.this) != -1) { - P_INT (&sv_pr_state, 0) = E_var (self, this, integer); + P_INT (&sv_pr_state, 0) = E_POINTER (self, this); P_INT (&sv_pr_state, 1) = 0; - P_INT (&sv_pr_state, 2) = E_var (other, this, integer); + P_INT (&sv_pr_state, 2) = E_POINTER (other, this); } PR_ExecuteProgram (&sv_pr_state, SVfunc (self, blocked)); }