buildtypes.h: Replace the *TYPE macros with a StructName concatenation function.

git-svn-id: https://svn.eduke32.com/eduke32@5998 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-01-05 05:29:57 +00:00
parent b7ee7d404c
commit d67b3edd06

View file

@ -8,18 +8,12 @@
#ifdef UNTRACKED_STRUCTS #ifdef UNTRACKED_STRUCTS
#define StructTracker(tracker, type) type #define StructTracker(tracker, type) type
#define StructName(name) u ## name
#define WALLTYPE uwalltype
#define SECTORTYPE usectortype
#define SPRITETYPE uspritetype
#else #else
#define StructTracker Tracker #define StructTracker Tracker
#define StructName(name) name
#define WALLTYPE walltypev7
#define SECTORTYPE sectortypev7
#define SPRITETYPE spritetype
#endif #endif
@ -58,7 +52,7 @@ typedef struct
StructTracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, fogpal; StructTracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, fogpal;
StructTracker(Sector, uint16_t) lotag, hitag; StructTracker(Sector, uint16_t) lotag, hitag;
StructTracker(Sector, int16_t) extra; StructTracker(Sector, int16_t) extra;
} SECTORTYPE; } StructName(sectortypev7);
//cstat: //cstat:
// bit 0: 1 = Blocking wall (use with clipmove, getzrange) "B" // bit 0: 1 = Blocking wall (use with clipmove, getzrange) "B"
@ -85,7 +79,7 @@ typedef struct
StructTracker(Wall, uint8_t) pal, xrepeat, yrepeat, xpanning, ypanning; StructTracker(Wall, uint8_t) pal, xrepeat, yrepeat, xpanning, ypanning;
StructTracker(Wall, uint16_t) lotag, hitag; StructTracker(Wall, uint16_t) lotag, hitag;
StructTracker(Wall, int16_t) extra; StructTracker(Wall, int16_t) extra;
} WALLTYPE; } StructName(walltypev7);
//cstat: //cstat:
// bit 0: 1 = Blocking sprite (use with clipmove, getzrange) "B" // bit 0: 1 = Blocking sprite (use with clipmove, getzrange) "B"
@ -122,10 +116,11 @@ typedef struct
StructTracker(Sprite, int16_t) ang, owner, xvel, yvel, zvel; StructTracker(Sprite, int16_t) ang, owner, xvel, yvel, zvel;
StructTracker(Sprite, uint16_t) lotag, hitag; StructTracker(Sprite, uint16_t) lotag, hitag;
StructTracker(Sprite, int16_t) extra; StructTracker(Sprite, int16_t) extra;
} SPRITETYPE; } StructName(spritetype);
//////////////////// END Version 7 map format //////////////// //////////////////// END Version 7 map format ////////////////
#undef StructTracker #undef StructTracker
#undef StructName
#endif // buildtypes_h__ #endif // buildtypes_h__