From 0ea5739881d540d5e5d8007917ee7e17d68a57be Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 25 Sep 2011 20:59:22 +0000 Subject: Fix special1/special2 values so that they can properly hold pointer values. This fixes Heretic under 64-bit. Subversion-branch: /branches/v2-branch Subversion-revision: 2406 --- src/heretic/doomdef.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/heretic/doomdef.h') diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h index 12290970..e379cfaf 100644 --- a/src/heretic/doomdef.h +++ b/src/heretic/doomdef.h @@ -142,6 +142,12 @@ typedef struct thinker_s think_t function; } thinker_t; +typedef union +{ + int i; + struct mobj_s *m; +} specialval_t; + struct player_s; typedef struct mobj_s @@ -171,8 +177,8 @@ typedef struct mobj_s int damage; // For missiles int flags; int flags2; // Heretic flags - int special1; // Special info - int special2; // Special info + specialval_t special1; // Special info + specialval_t special2; // Special info int health; int movedir; // 0-7 int movecount; // when 0, select a new dir -- cgit v1.2.3