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 src/r_defs.h

Browse source
This commit is contained in:
SteelT 2020-08-06 18:36:30 -04:00
parent ef8fd7b671
commit 30fd6f5db5
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/r_defs.h
View file

@ -551,7 +551,6 @@ typedef struct seg_s
r_lightlist_t *rlights; r_lightlist_t *rlights;
polyobj_t *polyseg; polyobj_t *polyseg;
boolean dontrenderme; boolean dontrenderme;
<<<<<<< HEAD
#endif #endif
// Fake contrast calculated on level load // Fake contrast calculated on level load
@ -559,9 +558,7 @@ typedef struct seg_s
#ifdef HWRENDER #ifdef HWRENDER
INT16 hwLightOffset; INT16 hwLightOffset;
#endif #endif
=======
boolean glseg; boolean glseg;
>>>>>>> srb2/next
} seg_t; } seg_t;
// //