From 422601bc82d8941c7b3baa16bd45ccd79b2631d9 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 26 Dec 2019 06:27:53 +0000 Subject: [PATCH] Make tspritetype its own distinct struct git-svn-id: https://svn.eduke32.com/eduke32@8520 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/include/build.h | 1 - source/build/include/buildtypes.h | 32 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/source/build/include/build.h b/source/build/include/build.h index f6089a0f6..66cf2b117 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -308,7 +308,6 @@ using uwalltype = uwalltypevx; using spritetype = spritetypev7; using uspritetype = uspritetypev7; -using tspritetype = uspritetypev7; using uspriteptr_t = uspritetype const *; using uwallptr_t = uwalltype const *; diff --git a/source/build/include/buildtypes.h b/source/build/include/buildtypes.h index cfab7ee3c..af8d810fc 100644 --- a/source/build/include/buildtypes.h +++ b/source/build/include/buildtypes.h @@ -212,6 +212,38 @@ typedef struct StructTracker(Sprite, int16_t) extra; } StructName(spritetypev7); +#ifndef buildtypes_h__enums +//44 bytes +// TODO: Remove unused fields from the end of this struct. (TSPRITE_SIZE) +typedef struct +{ + union { + struct + { + int32_t x, y, z; + }; + vec3_t pos; + }; + uint16_t cstat; + int16_t picnum; + int8_t shade; + uint8_t pal, clipdist, blend; + uint8_t xrepeat, yrepeat; + int8_t xoffset, yoffset; + int16_t sectnum, statnum; + int16_t ang, owner; + union { + struct + { + int16_t xvel, yvel, zvel; + }; + vec3_16_t vel; + }; + int16_t lotag, hitag; + int16_t extra; +} tspritetype; +#endif + //////////////////// END Version 7 map format //////////////// //////////////////// Lunatic new-generation map format ////////////////////