From 7e14a0fbf35053b8cdc63d1cd28bff732627c86a Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 27 Feb 2001 19:05:05 +0000 Subject: [PATCH] clean up RETURN_EDICT and RETURN_STRING definitions to be both easier to read and more correct for aliasing (and int size dependence, too:). --- nq/source/pr_cmds.c | 2 +- qw/source/sv_pr_cmds.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nq/source/pr_cmds.c b/nq/source/pr_cmds.c index 6022c433a..8bb532535 100644 --- a/nq/source/pr_cmds.c +++ b/nq/source/pr_cmds.c @@ -42,7 +42,7 @@ #include "msg.h" #include "server.h" -#define RETURN_EDICT(p,e) (((int *)p->pr_globals)[OFS_RETURN] = EDICT_TO_PROG(p, e)) +#define RETURN_EDICT(p,e) (p->pr_globals[OFS_RETURN].int_var = EDICT_TO_PROG(p, e)) /* =============================================================================== diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c index 3637e3af6..89d01c1c5 100644 --- a/qw/source/sv_pr_cmds.c +++ b/qw/source/sv_pr_cmds.c @@ -40,8 +40,8 @@ #include "world.h" #include "va.h" -#define RETURN_EDICT(p, e) (((int *)(p)->pr_globals)[OFS_RETURN] = EDICT_TO_PROG(p, e)) -#define RETURN_STRING(p, s) (((int *)(p)->pr_globals)[OFS_RETURN] = PR_SetString((p), s)) +#define RETURN_EDICT(p, e) ((p)->pr_globals[OFS_RETURN].int_var = EDICT_TO_PROG(p, e)) +#define RETURN_STRING(p, s) ((p)->pr_globals[OFS_RETURN].int_var = PR_SetString((p), s)) /* BUILT-IN FUNCTIONS