teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't use #pragma push_macro in buildtypes.h, for compatibility with GCC 4.2. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5167 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-04-26 00:45:55 +00:00
parent d11bf55a82
commit 4bf493c76b
1 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
polymer/eduke32/build/include/buildtypes.h
View file

@ -7,9 +7,7 @@
#ifdef UNTRACKED_STRUCTS #ifdef UNTRACKED_STRUCTS
#pragma push_macro("Tracker") #define StructTracker(tracker, type) type
#undef Tracker
#define Tracker(tracker, type) type
#define WALLTYPE twalltype #define WALLTYPE twalltype
#define SECTORTYPE tsectortype #define SECTORTYPE tsectortype
@ -17,6 +15,8 @@
#else #else
#define StructTracker Tracker
#define WALLTYPE walltypev7 #define WALLTYPE walltypev7
#define SECTORTYPE sectortypev7 #define SECTORTYPE sectortypev7
#define SPRITETYPE spritetype #define SPRITETYPE spritetype
@ -46,18 +46,18 @@
//40 bytes //40 bytes
typedef struct typedef struct
{ {
Tracker(Sector, int16_t) wallptr, wallnum; StructTracker(Sector, int16_t) wallptr, wallnum;
Tracker(Sector, int32_t) ceilingz, floorz; StructTracker(Sector, int32_t) ceilingz, floorz;
Tracker(Sector, uint16_t) ceilingstat, floorstat; StructTracker(Sector, uint16_t) ceilingstat, floorstat;
Tracker(Sector, int16_t) ceilingpicnum, ceilingheinum; StructTracker(Sector, int16_t) ceilingpicnum, ceilingheinum;
Tracker(Sector, int8_t) ceilingshade; StructTracker(Sector, int8_t) ceilingshade;
Tracker(Sector, uint8_t) ceilingpal, /*CM_FLOORZ:*/ ceilingxpanning, ceilingypanning; StructTracker(Sector, uint8_t) ceilingpal, /*CM_FLOORZ:*/ ceilingxpanning, ceilingypanning;
Tracker(Sector, int16_t) floorpicnum, floorheinum; StructTracker(Sector, int16_t) floorpicnum, floorheinum;
Tracker(Sector, int8_t) floorshade; StructTracker(Sector, int8_t) floorshade;
Tracker(Sector, uint8_t) floorpal, floorxpanning, floorypanning; StructTracker(Sector, uint8_t) floorpal, floorxpanning, floorypanning;
Tracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, fogpal; StructTracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, fogpal;
Tracker(Sector, uint16_t) lotag, hitag; StructTracker(Sector, uint16_t) lotag, hitag;
Tracker(Sector, int16_t) extra; StructTracker(Sector, int16_t) extra;
} SECTORTYPE; } SECTORTYPE;
//cstat: //cstat:
@ -77,14 +77,14 @@ typedef struct
//32 bytes //32 bytes
typedef struct typedef struct
{ {
Tracker(Wall, int32_t) x, y; StructTracker(Wall, int32_t) x, y;
Tracker(Wall, int16_t) point2, nextwall, nextsector; StructTracker(Wall, int16_t) point2, nextwall, nextsector;
Tracker(Wall, uint16_t) cstat; StructTracker(Wall, uint16_t) cstat;
Tracker(Wall, int16_t) picnum, overpicnum; StructTracker(Wall, int16_t) picnum, overpicnum;
Tracker(Wall, int8_t) shade; StructTracker(Wall, int8_t) shade;
Tracker(Wall, uint8_t) pal, xrepeat, yrepeat, xpanning, ypanning; StructTracker(Wall, uint8_t) pal, xrepeat, yrepeat, xpanning, ypanning;
Tracker(Wall, uint16_t) lotag, hitag; StructTracker(Wall, uint16_t) lotag, hitag;
Tracker(Wall, int16_t) extra; StructTracker(Wall, int16_t) extra;
} WALLTYPE; } WALLTYPE;
//cstat: //cstat:
@ -111,23 +111,21 @@ typedef struct
//44 bytes //44 bytes
typedef struct typedef struct
{ {
Tracker(Sprite, int32_t) x, y, z; StructTracker(Sprite, int32_t) x, y, z;
Tracker(Sprite, uint16_t) cstat; StructTracker(Sprite, uint16_t) cstat;
Tracker(Sprite, int16_t) picnum; StructTracker(Sprite, int16_t) picnum;
Tracker(Sprite, int8_t) shade; StructTracker(Sprite, int8_t) shade;
Tracker(Sprite, uint8_t) pal, clipdist, blend; StructTracker(Sprite, uint8_t) pal, clipdist, blend;
Tracker(Sprite, uint8_t) xrepeat, yrepeat; StructTracker(Sprite, uint8_t) xrepeat, yrepeat;
Tracker(Sprite, int8_t) xoffset, yoffset; StructTracker(Sprite, int8_t) xoffset, yoffset;
Tracker(Sprite, int16_t) sectnum, statnum; StructTracker(Sprite, int16_t) sectnum, statnum;
Tracker(Sprite, int16_t) ang, owner, xvel, yvel, zvel; StructTracker(Sprite, int16_t) ang, owner, xvel, yvel, zvel;
Tracker(Sprite, uint16_t) lotag, hitag; StructTracker(Sprite, uint16_t) lotag, hitag;
Tracker(Sprite, int16_t) extra; StructTracker(Sprite, int16_t) extra;
} SPRITETYPE; } SPRITETYPE;
//////////////////// END Version 7 map format //////////////// //////////////////// END Version 7 map format ////////////////
#ifdef UNTRACKED_STRUCTS #undef StructTracker
#pragma pop_macro("Tracker")
#endif
#endif // buildtypes_h__ #endif // buildtypes_h__