zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor cleanup regarding buildtypes.h

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6768 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-03-17 03:25:57 +00:00
parent a250f69a20
commit 9462ad4076
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/build/include/build.h
View file

@ -319,11 +319,11 @@ enum {
SPR_ALIGN_MASK = 32+16, SPR_ALIGN_MASK = 32+16,
}; };
#include "buildtypes.h"
#define UNTRACKED_STRUCTS #define UNTRACKED_STRUCTS
#undef buildtypes_h__
#include "buildtypes.h" #include "buildtypes.h"
#undef UNTRACKED_STRUCTS #undef UNTRACKED_STRUCTS
#undef buildtypes_h__
#include "buildtypes.h"
#if !defined NEW_MAP_FORMAT #if !defined NEW_MAP_FORMAT
typedef sectortypev7 sectortype; typedef sectortypev7 sectortype;
@ -339,6 +339,9 @@ typedef walltypevx walltype;
typedef uwalltypevx uwalltype; typedef uwalltypevx uwalltype;
#endif #endif
typedef spritetypev7 spritetype;
typedef uspritetypev7 uspritetype;
// this is probably never going to be necessary // this is probably never going to be necessary
EDUKE32_STATIC_ASSERT(sizeof(sectortype) == sizeof(usectortype)); EDUKE32_STATIC_ASSERT(sizeof(sectortype) == sizeof(usectortype));
EDUKE32_STATIC_ASSERT(sizeof(walltype) == sizeof(uwalltype)); EDUKE32_STATIC_ASSERT(sizeof(walltype) == sizeof(uwalltype));

8
source/build/include/buildtypes.h
View file

@ -113,11 +113,17 @@ enum
CSTAT_SPRITE_YCENTER = 1u<<7u, CSTAT_SPRITE_YCENTER = 1u<<7u,
CSTAT_SPRITE_BLOCK_HITSCAN = 1u<<8u, CSTAT_SPRITE_BLOCK_HITSCAN = 1u<<8u,
CSTAT_SPRITE_TRANSLUCENT_INVERT = 1u<<9u, CSTAT_SPRITE_TRANSLUCENT_INVERT = 1u<<9u,
CSTAT_SPRITE_RESERVED1 = 1u<<10u, // game-side CSTAT_SPRITE_RESERVED1 = 1u<<10u, // game-side
CSTAT_SPRITE_RESERVED2 = 1u<<11u, // game-side CSTAT_SPRITE_RESERVED2 = 1u<<11u, // game-side
CSTAT_SPRITE_RESERVED3 = 1u<<12u, CSTAT_SPRITE_RESERVED3 = 1u<<12u,
CSTAT_SPRITE_RESERVED4 = 1u<<13u,
CSTAT_SPRITE_RESERVED5 = 1u<<14u,
// TODO: Make these two Duke3D-only by translating them to bits in tspr
CSTAT_SPRITE_NO_SHADOW = 1u<<13u, // re-defined in Shadow Warrior CSTAT_SPRITE_NO_SHADOW = 1u<<13u, // re-defined in Shadow Warrior
CSTAT_SPRITE_INVISIBLE_WITH_SHADOW = 1u<<14u, // re-defined in Shadow Warrior CSTAT_SPRITE_INVISIBLE_WITH_SHADOW = 1u<<14u, // re-defined in Shadow Warrior
CSTAT_SPRITE_INVISIBLE = 1u<<15u, CSTAT_SPRITE_INVISIBLE = 1u<<15u,
}; };
enum enum
@ -143,7 +149,7 @@ typedef struct
StructTracker(Sprite, int16_t) ang, owner, xvel, yvel, zvel; StructTracker(Sprite, int16_t) ang, owner, xvel, yvel, zvel;
StructTracker(Sprite, int16_t) lotag, hitag; StructTracker(Sprite, int16_t) lotag, hitag;
StructTracker(Sprite, int16_t) extra; StructTracker(Sprite, int16_t) extra;
} StructName(spritetype); } StructName(spritetypev7);
//////////////////// END Version 7 map format //////////////// //////////////////// END Version 7 map format ////////////////