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 r_main.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 15:02:32 -04:00
parent d5397935cd
commit 37ab195a85
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/r_main.c
View file

@ -33,12 +33,9 @@
#include "z_zone.h"
#include "m_random.h" // quake camera shake
#include "r_portal.h"
<<<<<<< HEAD
#include "doomstat.h" // MAXSPLITSCREENPLAYERS
=======
#include "r_main.h"
#include "i_system.h" // I_GetTimeMicros
>>>>>>> srb2/next
#include "doomstat.h" // MAXSPLITSCREENPLAYERS
#ifdef HWRENDER
#include "hardware/hw_main.h"
@ -1154,16 +1151,6 @@ static void R_SetupFreelook(void)
// (lmps, network and use F12...)
if (rendermode == render_soft
#ifdef HWRENDER
<<<<<<< HEAD
|| cv_grshearing.value
#endif
)
G_SoftwareClipAimingPitch((INT32 *)&aimingangle);
if (rendermode == render_soft)
{
dy = (AIMINGTODY(aimingangle)/fovtan) * viewwidth/BASEVIDWIDTH;
=======
|| cv_glshearing.value
#endif
)
@ -1174,7 +1161,6 @@ static void R_SetupFreelook(void)
if (rendermode == render_soft)
{
dy = (AIMINGTODY(aimingangle)>>FRACBITS) * viewwidth/BASEVIDWIDTH;
>>>>>>> srb2/next
yslope = &yslopetab[viewheight*8 - (viewheight/2 + dy)];
}