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_state.h

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

6
src/r_state.h
View file

@ -39,14 +39,11 @@ typedef struct
extern sprcache_t *spritecachedinfo; extern sprcache_t *spritecachedinfo;
extern lighttable_t *colormaps; extern lighttable_t *colormaps;
<<<<<<< HEAD
extern UINT8 *encoremap; extern UINT8 *encoremap;
#ifdef HASINVERT #ifdef HASINVERT
extern UINT8 invertmap[256]; extern UINT8 invertmap[256];
#endif #endif
=======
extern lighttable_t *fadecolormap; extern lighttable_t *fadecolormap;
>>>>>>> srb2/next
// Boom colormaps. // Boom colormaps.
extern extracolormap_t *extra_colormaps; extern extracolormap_t *extra_colormaps;
@ -92,12 +89,9 @@ extern side_t *spawnsides;
// //
extern fixed_t viewx, viewy, viewz; extern fixed_t viewx, viewy, viewz;
extern angle_t viewangle, aimingangle; extern angle_t viewangle, aimingangle;
<<<<<<< HEAD
extern UINT8 viewssnum; // splitscreen view number extern UINT8 viewssnum; // splitscreen view number
extern boolean viewsky, skyVisible; extern boolean viewsky, skyVisible;
extern boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible of each splitscreen player extern boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible of each splitscreen player
=======
>>>>>>> srb2/next
extern sector_t *viewsector; extern sector_t *viewsector;
extern player_t *viewplayer; extern player_t *viewplayer;
extern mobj_t *r_viewmobj; extern mobj_t *r_viewmobj;