undo whitespace change

This commit is contained in:
Eric Wasylishen 2017-05-24 13:21:42 -06:00
parent a97aa76668
commit 9367828343
3 changed files with 7 additions and 7 deletions

View file

@ -968,14 +968,14 @@ void R_ScaleView (void)
if (r_scale.value == 1) if (r_scale.value == 1)
return; return;
// copied from R_SetupGL() // copied from R_SetupGL()
scale = CLAMP(1, (int)r_scale.value, 4); scale = CLAMP(1, (int)r_scale.value, 4);
srcx = glx + r_refdef.vrect.x; srcx = glx + r_refdef.vrect.x;
srcy = gly + glheight - r_refdef.vrect.y - r_refdef.vrect.height; srcy = gly + glheight - r_refdef.vrect.y - r_refdef.vrect.height;
srcw = r_refdef.vrect.width / scale; srcw = r_refdef.vrect.width / scale;
srch = r_refdef.vrect.height / scale; srch = r_refdef.vrect.height / scale;
// create render-to-texture texture if needed // create render-to-texture texture if needed
if (!r_scaleview_texture) if (!r_scaleview_texture)
{ {
@ -985,7 +985,7 @@ void R_ScaleView (void)
r_scaleview_texture_width = 0; r_scaleview_texture_width = 0;
r_scaleview_texture_height = 0; r_scaleview_texture_height = 0;
} }
// resize render-to-texture texture if needed // resize render-to-texture texture if needed
if (r_scaleview_texture_width < srcw if (r_scaleview_texture_width < srcw
|| r_scaleview_texture_height < srch) || r_scaleview_texture_height < srch)
@ -1106,7 +1106,7 @@ void R_RenderView (void)
R_RenderScene (); R_RenderScene ();
} }
//johnfitz //johnfitz
R_ScaleView (); R_ScaleView ();
//johnfitz -- modified r_speeds output //johnfitz -- modified r_speeds output

View file

@ -240,7 +240,7 @@ void R_Init (void)
Cvar_SetCallback (&r_lavaalpha, R_SetLavaalpha_f); Cvar_SetCallback (&r_lavaalpha, R_SetLavaalpha_f);
Cvar_SetCallback (&r_telealpha, R_SetTelealpha_f); Cvar_SetCallback (&r_telealpha, R_SetTelealpha_f);
Cvar_SetCallback (&r_slimealpha, R_SetSlimealpha_f); Cvar_SetCallback (&r_slimealpha, R_SetSlimealpha_f);
R_InitParticles (); R_InitParticles ();
R_SetClearColor_f (&r_clearcolor); //johnfitz R_SetClearColor_f (&r_clearcolor); //johnfitz

View file

@ -322,7 +322,7 @@ static void SCR_CalcRefdef (void)
r_refdef.vrect.x = (glwidth - r_refdef.vrect.width)/2; r_refdef.vrect.x = (glwidth - r_refdef.vrect.width)/2;
r_refdef.vrect.y = (glheight - sb_lines - r_refdef.vrect.height)/2; r_refdef.vrect.y = (glheight - sb_lines - r_refdef.vrect.height)/2;
//johnfitz //johnfitz
r_refdef.fov_x = AdaptFovx(scr_fov.value, vid.width, vid.height); r_refdef.fov_x = AdaptFovx(scr_fov.value, vid.width, vid.height);
r_refdef.fov_y = CalcFovy (r_refdef.fov_x, r_refdef.vrect.width, r_refdef.vrect.height); r_refdef.fov_y = CalcFovy (r_refdef.fov_x, r_refdef.vrect.width, r_refdef.vrect.height);
@ -421,7 +421,7 @@ void SCR_Init (void)
Cvar_RegisterVariable (&scr_centertime); Cvar_RegisterVariable (&scr_centertime);
Cvar_RegisterVariable (&scr_printspeed); Cvar_RegisterVariable (&scr_printspeed);
Cvar_RegisterVariable (&gl_triplebuffer); Cvar_RegisterVariable (&gl_triplebuffer);
Cmd_AddCommand ("screenshot",SCR_ScreenShot_f); Cmd_AddCommand ("screenshot",SCR_ScreenShot_f);
Cmd_AddCommand ("sizeup",SCR_SizeUp_f); Cmd_AddCommand ("sizeup",SCR_SizeUp_f);
Cmd_AddCommand ("sizedown",SCR_SizeDown_f); Cmd_AddCommand ("sizedown",SCR_SizeDown_f);