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

fix E_POINTER and E_FUNCTION

Browse source
This commit is contained in:
Bill Currie 2003-09-12 23:12:21 +00:00
parent 31112bfc42
commit 84ea81a770
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/QF/progs.h
View file

@ -169,8 +169,8 @@ qboolean PR_EdictValid (progs_t *pr, int e);
#define E_UINT(e,o) E_var (e, o, uinteger) #define E_UINT(e,o) E_var (e, o, uinteger)
#define E_VECTOR(e,o) E_var (e, o, vector) #define E_VECTOR(e,o) E_var (e, o, vector)
#define E_STRING(e,o) E_var (e, o, string) #define E_STRING(e,o) E_var (e, o, string)
#define E_FUNCTION(p) E_var (p, o, func) #define E_FUNCTION(p,o) E_var (p, o, func)
#define E_POINTER(p) E_var (p, o, pointer) #define E_POINTER(p,o) E_var (p, o, pointer)
#define E_GSTRING(p,e,o) (PR_GetString (p, E_STRING (e, o))) #define E_GSTRING(p,e,o) (PR_GetString (p, E_STRING (e, o)))

10
nq/include/sv_progs.h
View file

@ -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.self = EDICT_TO_PROG (&sv_pr_state, self);
*sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other); *sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other);
if ((this = sv_pr_state.fields.this) != -1) { 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, 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)); 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.self = EDICT_TO_PROG (&sv_pr_state, self);
*sv_globals.other = 0; *sv_globals.other = 0;
if ((this = sv_pr_state.fields.this) != -1) { 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, 1) = 0;
P_INT (&sv_pr_state, 2) = 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.self = EDICT_TO_PROG (&sv_pr_state, self);
*sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other); *sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other);
if ((this = sv_pr_state.fields.this) != -1) { 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, 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)); PR_ExecuteProgram (&sv_pr_state, SVfunc (self, blocked));
} }

10
qw/include/sv_progs.h
View file

@ -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.self = EDICT_TO_PROG (&sv_pr_state, self);
*sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other); *sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other);
if ((this = sv_pr_state.fields.this) != -1) { 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, 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)); 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.self = EDICT_TO_PROG (&sv_pr_state, self);
*sv_globals.other = 0; *sv_globals.other = 0;
if ((this = sv_pr_state.fields.this) != -1) { 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, 1) = 0;
P_INT (&sv_pr_state, 2) = 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.self = EDICT_TO_PROG (&sv_pr_state, self);
*sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other); *sv_globals.other = EDICT_TO_PROG (&sv_pr_state, other);
if ((this = sv_pr_state.fields.this) != -1) { 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, 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)); PR_ExecuteProgram (&sv_pr_state, SVfunc (self, blocked));
} }