thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-11 10:32:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge screen.h

Browse source
This commit is contained in:
SteelT 2020-08-05 15:11:15 -04:00
parent d27f16c4d5
commit 23736017ec
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/screen.h
View file

@ -179,16 +179,12 @@ extern UINT8 setrenderneeded;
extern INT32 scr_bpp; extern INT32 scr_bpp;
extern UINT8 *scr_borderpatch; // patch used to fill the view borders extern UINT8 *scr_borderpatch; // patch used to fill the view borders
<<<<<<< HEAD extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_renderer, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
=======
extern CV_PossibleValue_t cv_renderer_t[]; extern CV_PossibleValue_t cv_renderer_t[];
extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_renderer, cv_fullscreen;
#ifdef HWRENDER #ifdef HWRENDER
extern consvar_t cv_newrenderer; extern consvar_t cv_newrenderer;
#endif #endif
>>>>>>> srb2/next
// wait for page flipping to end or not // wait for page flipping to end or not
extern consvar_t cv_vidwait; extern consvar_t cv_vidwait;
@ -208,10 +204,7 @@ FUNCMATH boolean SCR_IsAspectCorrect(INT32 width, INT32 height);
// move out to main code for consistency // move out to main code for consistency
void SCR_DisplayTicRate(void); void SCR_DisplayTicRate(void);
<<<<<<< HEAD
=======
void SCR_ClosedCaptions(void); void SCR_ClosedCaptions(void);
>>>>>>> srb2/next
void SCR_DisplayLocalPing(void); void SCR_DisplayLocalPing(void);
#undef DNWH #undef DNWH
#endif //__SCREEN_H__ #endif //__SCREEN_H__