diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c index 87015240..332ab1ec 100644 --- a/Quake/gl_rmain.c +++ b/Quake/gl_rmain.c @@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -qboolean r_cache_thrash; // compatability - vec3_t modelorg, r_entorigin; entity_t *currententity; @@ -538,8 +536,6 @@ void R_SetupView (void) V_SetContentsColor (r_viewleaf->contents); V_CalcBlend (); - r_cache_thrash = false; - //johnfitz -- calculate r_fovx and r_fovy here r_fovx = r_refdef.fov_x; r_fovy = r_refdef.fov_y; diff --git a/Quake/gl_screen.c b/Quake/gl_screen.c index bc209d2f..962c0ebb 100644 --- a/Quake/gl_screen.c +++ b/Quake/gl_screen.c @@ -94,7 +94,6 @@ cvar_t scr_fov = {"fov","90",CVAR_NONE}; // 10 - 170 cvar_t scr_fov_adapt = {"fov_adapt","1",CVAR_ARCHIVE}; cvar_t scr_conspeed = {"scr_conspeed","500",CVAR_ARCHIVE}; cvar_t scr_centertime = {"scr_centertime","2",CVAR_NONE}; -cvar_t scr_showram = {"showram","1",CVAR_NONE}; cvar_t scr_showturtle = {"showturtle","0",CVAR_NONE}; cvar_t scr_showpause = {"showpause","1",CVAR_NONE}; cvar_t scr_printspeed = {"scr_printspeed","8",CVAR_NONE}; @@ -106,7 +105,6 @@ extern cvar_t crosshair; qboolean scr_initialized; // ready to draw -qpic_t *scr_ram; qpic_t *scr_net; qpic_t *scr_turtle; @@ -386,7 +384,6 @@ SCR_LoadPics -- johnfitz */ void SCR_LoadPics (void) { - scr_ram = Draw_PicFromWad ("ram"); scr_net = Draw_PicFromWad ("net"); scr_turtle = Draw_PicFromWad ("turtle"); } @@ -419,7 +416,6 @@ void SCR_Init (void) Cvar_RegisterVariable (&scr_fov_adapt); Cvar_RegisterVariable (&scr_viewsize); Cvar_RegisterVariable (&scr_conspeed); - Cvar_RegisterVariable (&scr_showram); Cvar_RegisterVariable (&scr_showturtle); Cvar_RegisterVariable (&scr_showpause); Cvar_RegisterVariable (&scr_centertime); @@ -556,24 +552,6 @@ void SCR_DrawDevStats (void) Draw_String (x, (y++)*8-x, str); } -/* -============== -SCR_DrawRam -============== -*/ -void SCR_DrawRam (void) -{ - if (!scr_showram.value) - return; - - if (!r_cache_thrash) - return; - - GL_SetCanvas (CANVAS_DEFAULT); //johnfitz - - Draw_Pic (scr_vrect.x+32, scr_vrect.y, scr_ram); -} - /* ============== SCR_DrawTurtle @@ -1116,7 +1094,6 @@ void SCR_UpdateScreen (void) else { SCR_DrawCrosshair (); //johnfitz - SCR_DrawRam (); SCR_DrawNet (); SCR_DrawTurtle (); SCR_DrawPause (); diff --git a/Quake/glquake.h b/Quake/glquake.h index efe9e0e2..2912d08c 100644 --- a/Quake/glquake.h +++ b/Quake/glquake.h @@ -102,7 +102,6 @@ typedef struct particle_s //==================================================== -extern qboolean r_cache_thrash; // compatability extern vec3_t modelorg, r_entorigin; extern entity_t *currententity; extern int r_visframecount; // ??? what difs? diff --git a/Quake/render.h b/Quake/render.h index 4ecb9733..bf057b0e 100644 --- a/Quake/render.h +++ b/Quake/render.h @@ -166,7 +166,6 @@ void R_PushDlights (void); // surface cache related // extern int reinit_surfcache; // if 1, surface cache is currently empty and -extern qboolean r_cache_thrash; // set if thrashing the surface cache int D_SurfaceCacheForRes (int width, int height); void D_FlushCaches (void);