Merge r_draw.h

This commit is contained in:
SteelT 2020-08-08 16:20:10 -04:00
parent 9cfe5513c2
commit f897061629

View file

@ -110,14 +110,9 @@ extern lumpnum_t viewborderlump[8];
#define TC_BOSS -2
#define TC_METALSONIC -3 // For Metal Sonic battle
#define TC_ALLWHITE -4 // For Cy-Brak-demon
<<<<<<< HEAD
#define TC_RAINBOW -5 // For invincibility power
#define TC_BLINK -6 // For item blinking
=======
#define TC_RAINBOW -5 // For single colour
#define TC_BLINK -6 // For item blinking, according to kart
#define TC_DASHMODE -7 // For Metal Sonic's dashmode
>>>>>>> srb2/next
// Initialize color translation tables, for player rendering etc.
void R_InitTranslationTables(void);