thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge doomdata.h

Browse source
This commit is contained in:
SteelT 2020-08-04 01:05:57 -04:00
parent c5f9a586a0
commit 11671aa6d8
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/doomdata.h
View file

@ -46,11 +46,7 @@ enum
ML_BLOCKMAP, // LUT, motion clipping, walls/grid element ML_BLOCKMAP, // LUT, motion clipping, walls/grid element
}; };
<<<<<<< HEAD
// Extra flag for objects
=======
// Extra flag for objects. // Extra flag for objects.
>>>>>>> srb2/next
#define MTF_EXTRA 1 #define MTF_EXTRA 1
// Reverse gravity flag for objects. // Reverse gravity flag for objects.
@ -212,12 +208,9 @@ typedef struct
#define ZSHIFT 4 #define ZSHIFT 4
<<<<<<< HEAD
//extern const char *Color_Names[MAXSKINCOLORS]; //extern const char *Color_Names[MAXSKINCOLORS];
//extern const UINT8 Color_Opposite[MAXSKINCOLORS*2]; //extern const UINT8 Color_Opposite[MAXSKINCOLORS*2];
=======
>>>>>>> srb2/next
#define NUMMAPS 1035 #define NUMMAPS 1035
#endif // __DOOMDATA__ #endif // __DOOMDATA__