From e236ac4bb2219ecfd366a386a0ed532835f709a4 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 10 Apr 2001 02:36:44 +0000 Subject: [PATCH] move mplane_t to qtypes.h so non-asm builds will build (so long as you're not trying to build -svga) --- include/QF/qtypes.h | 13 +++++++++++++ nq/include/model.h | 15 --------------- qw/include/model.h | 15 --------------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/include/QF/qtypes.h b/include/QF/qtypes.h index 1688f1011..7b2f4afa1 100644 --- a/include/QF/qtypes.h +++ b/include/QF/qtypes.h @@ -60,6 +60,19 @@ typedef int fixed4_t; typedef int fixed8_t; typedef int fixed16_t; +#define SIDE_FRONT 0 +#define SIDE_BACK 1 +#define SIDE_ON 2 + +// plane_t structure +// !!! if this is changed, it must be changed in asm_i386.h too !!! +typedef struct mplane_s { + vec3_t normal; + float dist; + byte type; // for texture axis selection and fast side tests + byte signbits; // signx + signy<<1 + signz<<1 + byte pad[2]; +} mplane_t; typedef byte pixel_t; diff --git a/nq/include/model.h b/nq/include/model.h index 94f32e9f1..2cc27cb7c 100644 --- a/nq/include/model.h +++ b/nq/include/model.h @@ -72,21 +72,6 @@ typedef struct vec3_t position; } mvertex_t; -#define SIDE_FRONT 0 -#define SIDE_BACK 1 -#define SIDE_ON 2 - -// plane_t structure -// !!! if this is changed, it must be changed in asm_ia32.h too !!! -typedef struct mplane_s -{ - vec3_t normal; - float dist; - byte type; // for texture axis selection and fast side tests - byte signbits; // signx + signy<<1 + signz<<1 - byte pad[2]; -} mplane_t; - typedef struct texture_s { char name[16]; diff --git a/qw/include/model.h b/qw/include/model.h index 1ba108db1..8eaf2510f 100644 --- a/qw/include/model.h +++ b/qw/include/model.h @@ -72,21 +72,6 @@ typedef struct vec3_t position; } mvertex_t; -#define SIDE_FRONT 0 -#define SIDE_BACK 1 -#define SIDE_ON 2 - -// plane_t structure -// !!! if this is changed, it must be changed in asm_i386.h too !!! -typedef struct mplane_s -{ - vec3_t normal; - float dist; - byte type; // for texture axis selection and fast side tests - byte signbits; // signx + signy<<1 + signz<<1 - byte pad[2]; -} mplane_t; - typedef struct texture_s { char name[16];