From 5429655ce826618ae97d833aea0a97b2948584e5 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Thu, 26 Aug 2021 22:30:56 -0600 Subject: [PATCH] qbsp: move internal content types to bspfile.hh --- include/common/bspfile.hh | 10 ++++++++++ include/qbsp/qbsp.hh | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/common/bspfile.hh b/include/common/bspfile.hh index b6793eff..fbfa692b 100644 --- a/include/common/bspfile.hh +++ b/include/common/bspfile.hh @@ -235,6 +235,16 @@ typedef struct { #define CONTENTS_SKY -6 #define CONTENTS_MIN CONTENTS_SKY +#define CONTENTS_CLIP -7 /* compiler internal use only */ +#define CONTENTS_HINT -8 /* compiler internal use only */ +#define CONTENTS_ORIGIN -9 /* compiler internal use only */ +#define CONTENTS_DETAIL -10 /* compiler internal use only */ +#define CONTENTS_DETAIL_ILLUSIONARY -11 /* compiler internal use only */ +#define CONTENTS_DETAIL_FENCE -12 /* compiler internal use only */ +#define CONTENTS_ILLUSIONARY_VISBLOCKER -13 +#define CONTENTS_FENCE -15 /* compiler internal use only */ +#define CONTENTS_LADDER -16 /* reserved for engine use */ + // Q2 contents (from qfiles.h) // contents flags are seperate bits diff --git a/include/qbsp/qbsp.hh b/include/qbsp/qbsp.hh index 58703932..cab5d557 100644 --- a/include/qbsp/qbsp.hh +++ b/include/qbsp/qbsp.hh @@ -98,16 +98,6 @@ // Pi #define Q_PI 3.14159265358979323846 -#define CONTENTS_CLIP -7 /* compiler internal use only */ -#define CONTENTS_HINT -8 /* compiler internal use only */ -#define CONTENTS_ORIGIN -9 /* compiler internal use only */ -#define CONTENTS_DETAIL -10 /* compiler internal use only */ -#define CONTENTS_DETAIL_ILLUSIONARY -11 /* compiler internal use only */ -#define CONTENTS_DETAIL_FENCE -12 /* compiler internal use only */ -#define CONTENTS_ILLUSIONARY_VISBLOCKER -13 -#define CONTENTS_FENCE -15 /* compiler internal use only */ -#define CONTENTS_LADDER -16 /* reserved for engine use */ - // Special contents flags for the compiler only #define CFLAGS_STRUCTURAL_COVERED_BY_DETAIL (1U << 0) #define CFLAGS_WAS_ILLUSIONARY (1U << 1) /* was illusionary, got changed to something else */