From 1b101bab978eae3b716b0d83318c156610af54e6 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Fri, 17 Jul 2009 21:25:53 +0000 Subject: [PATCH] remove ram icon (no longer makes sense with non-sw) git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3287 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_screen.c | 16 ---------------- engine/client/renderer.c | 2 -- engine/client/screen.h | 1 - 3 files changed, 19 deletions(-) diff --git a/engine/client/cl_screen.c b/engine/client/cl_screen.c index 95e6e95fb..d01fd42f8 100644 --- a/engine/client/cl_screen.c +++ b/engine/client/cl_screen.c @@ -170,7 +170,6 @@ extern cvar_t scr_viewsize; extern cvar_t scr_fov; extern cvar_t scr_conspeed; extern cvar_t scr_centertime; -extern cvar_t scr_showram; extern cvar_t scr_showturtle; extern cvar_t scr_showpause; extern cvar_t scr_printspeed; @@ -182,7 +181,6 @@ extern cvar_t scr_consize; qboolean scr_initialized; // ready to draw -mpic_t *scr_ram; mpic_t *scr_net; mpic_t *scr_turtle; @@ -1076,7 +1074,6 @@ void SCR_Init (void) Cmd_AddRemCommand ("sizeup",SCR_SizeUp_f); Cmd_AddRemCommand ("sizedown",SCR_SizeDown_f); - scr_ram = Draw_SafePicFromWad ("ram"); scr_net = Draw_SafePicFromWad ("net"); scr_turtle = Draw_SafePicFromWad ("turtle"); @@ -1095,18 +1092,6 @@ void SCR_DeInit (void) } } -/* -============== -SCR_DrawRam -============== -*/ -void SCR_DrawRam (void) -{ - if (!scr_showram.value || !scr_ram) - return; - - Draw_Pic (scr_vrect.x+32, scr_vrect.y, scr_ram); -} /* ============== @@ -2249,7 +2234,6 @@ void SCR_DrawTwoDimensional(int uimenu, qboolean nohud) { Draw_Crosshair(); - SCR_DrawRam (); SCR_DrawNet (); SCR_DrawFPS (); SCR_DrawUPS (); diff --git a/engine/client/renderer.c b/engine/client/renderer.c index 8e052cf7f..ee8b0f00d 100644 --- a/engine/client/renderer.c +++ b/engine/client/renderer.c @@ -162,7 +162,6 @@ cvar_t scr_fov = SCVARFC("fov", "90", SCR_Fov_Callback); cvar_t scr_printspeed = SCVAR ("scr_printspeed", "8"); cvar_t scr_showpause = SCVAR ("showpause", "1"); -cvar_t scr_showram = SCVAR ("showram", "1"); cvar_t scr_showturtle = SCVAR ("showturtle", "0"); cvar_t scr_sshot_compression = SCVAR ("scr_sshot_compression", "75"); cvar_t scr_sshot_type = SCVAR ("scr_sshot_type", "jpg"); @@ -586,7 +585,6 @@ void Renderer_Init(void) //screen Cvar_Register (&scr_conspeed, SCREENOPTIONS); Cvar_Register (&scr_conalpha, SCREENOPTIONS); - Cvar_Register (&scr_showram, SCREENOPTIONS); Cvar_Register (&scr_showturtle, SCREENOPTIONS); Cvar_Register (&scr_showpause, SCREENOPTIONS); Cvar_Register (&scr_centertime, SCREENOPTIONS); diff --git a/engine/client/screen.h b/engine/client/screen.h index 93cdadbbd..f30b30a23 100644 --- a/engine/client/screen.h +++ b/engine/client/screen.h @@ -69,7 +69,6 @@ void SCR_CalcRefdef (void); void SCR_TileClear (void); void SCR_DrawNotifyString (void); void SCR_CheckDrawCenterString (void); -void SCR_DrawRam (void); void SCR_DrawNet (void); void SCR_DrawTurtle (void); void SCR_DrawPause (void);