From f53a6a19fec6a3c31d37533fe2842c8fd1b06f29 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 16 Jun 2022 09:50:00 -0400 Subject: [PATCH] move extended_texinfo_t to qbsp, since it's only used during compilation and not related to the BSP file --- include/common/bspfile.hh | 17 ----------------- include/qbsp/qbsp.hh | 10 ++++++++++ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/include/common/bspfile.hh b/include/common/bspfile.hh index 19806616..56f4b5ef 100644 --- a/include/common/bspfile.hh +++ b/include/common/bspfile.hh @@ -899,23 +899,6 @@ public: bool is_valid(const gamedef_t *game) const; }; -// header before tightly packed surfflags_t[num_texinfo] -struct extended_flags_header_t -{ - uint32_t num_texinfo; - uint32_t surfflags_size; // sizeof(surfflags_t) -}; - -// data representation of only extended flags -// used by Q2 format; used by various systems. -struct extended_texinfo_t -{ - contentflags_t contents = {0}; - surfflags_t flags = {0}; - int value = 0; - std::string animation; -}; - template struct texvec : qmat { diff --git a/include/qbsp/qbsp.hh b/include/qbsp/qbsp.hh index 7d617d79..2a39f6d7 100644 --- a/include/qbsp/qbsp.hh +++ b/include/qbsp/qbsp.hh @@ -66,6 +66,16 @@ enum class conversion_t bp }; +// data representation of only extended flags +// used by Q2 format; used by various systems. +struct extended_texinfo_t +{ + contentflags_t contents = {0}; + surfflags_t flags = {0}; + int value = 0; + std::string animation; +}; + namespace settings { struct wadpath