eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

remove more unused sw variables

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3289 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2009-07-17 22:15:37 +00:00
parent 793825b0ee
commit 4b2c4ed77a
11 changed files with 2 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
engine/client/cl_screen.c
View file

@ -157,10 +157,6 @@ int mouseusedforgui;
int mousecursor_x, mousecursor_y;
int mousemove_x, mousemove_y;
// only the refresh window will be updated unless these variables are flagged
int scr_copytop;
int scr_copyeverything;
float scr_con_current;
float scr_conlines; // lines of console to display
@ -184,8 +180,6 @@ qboolean scr_initialized; // ready to draw
mpic_t *scr_net;
mpic_t *scr_turtle;
int scr_fullupdate;
int clearconsole;
int clearnotify;
@ -199,7 +193,6 @@ qboolean scr_disabled_for_loading;
qboolean scr_drawloading;
float scr_disabled_time;
qboolean block_drawing;
float oldsbar = 0;
void SCR_ScreenShot_f (void);
@ -396,7 +389,6 @@ void SCR_EraseCenterString (void)
else
y = 48;
scr_copytop = 1;
Draw_TileClear (0, y, vid.width, min(8*scr_erase_lines[pnum], vid.height - y - 1));
}
}
@ -537,7 +529,6 @@ extern qboolean sb_showscores;
for (pnum = 0; pnum < cl.splitclients; pnum++)
{
scr_copytop = 1;
if (scr_center_lines[pnum] > scr_erase_lines[pnum])
scr_erase_lines[pnum] = scr_center_lines[pnum];
@ -876,7 +867,6 @@ void SCR_CalcRefdef (void)
int h;
qboolean full = false;
scr_fullupdate = 0; // force a background redraw
vid.recalc_refdef = 0;
// force the status bar to redraw
@ -1489,7 +1479,6 @@ void SCR_BeginLoadingPlaque (void)
// return;
// redraw with no console and the loading plaque
scr_fullupdate = 0;
Sbar_Changed ();
scr_drawloading = true;
SCR_UpdateScreen ();
@ -1497,7 +1486,6 @@ void SCR_BeginLoadingPlaque (void)
scr_disabled_for_loading = true;
scr_disabled_time = Sys_DoubleTime(); //realtime tends to change... Hmmm....
scr_fullupdate = 0;
}
void SCR_EndLoadingPlaque (void)
@ -1506,7 +1494,6 @@ void SCR_EndLoadingPlaque (void)
// return;
scr_disabled_for_loading = false;
scr_fullupdate = 0;
*levelshotname = '\0';
}
@ -1635,7 +1622,6 @@ void SCR_DrawConsole (qboolean noback)
{
if (scr_con_current)
{
scr_copyeverything = 1;
Con_DrawConsole (scr_con_current, noback);
clearconsole = 0;
}
@ -2058,7 +2044,6 @@ int SCR_ModalMessage (char *text)
scr_notifystring = text;
// draw a fresh screen
scr_fullupdate = 0;
scr_drawdialog = true;
SCR_UpdateScreen ();
scr_drawdialog = false;
@ -2071,7 +2056,6 @@ int SCR_ModalMessage (char *text)
Sys_SendKeyEvents ();
} while (key_lastpress != 'y' && key_lastpress != 'n' && key_lastpress != K_ESCAPE);
scr_fullupdate = 0;
SCR_UpdateScreen ();
return key_lastpress == 'y';
@ -2196,7 +2180,6 @@ void SCR_DrawTwoDimensional(int uimenu, qboolean nohud)
SCR_ShowPics_Draw();
Draw_FadeScreen ();
SCR_DrawNotifyString ();
scr_copyeverything = true;
}
else if (scr_drawloading || loading_stage)
{

2
engine/client/menu.c
View file

@ -1036,9 +1036,7 @@ void M_Draw (int uimenu)
if ((!menu_script || scr_con_current) && !m_recursiveDraw)
{
scr_copyeverything = 1;
Draw_FadeScreen ();
scr_fullupdate = 0;
}
else
{

7
engine/client/renderer.c
View file

@ -11,14 +11,9 @@ qboolean vid_isfullscreen;
#define GRAPHICALNICETIES "Graphical Nicaties" //or eyecandy, which ever you prefer.
#define BULLETENVARS "BulletenBoard controls"
#define GLRENDEREROPTIONS "GL Renderer Options"
#define SWRENDEREROPTIONS "SW Renderer Options"
#define SCREENOPTIONS "Screen Options"
unsigned short d_8to16table[256];
unsigned int d_8to24bgrtable[256];
unsigned int d_8to24rgbtable[256];
unsigned int *d_8to32table = d_8to24bgrtable; //palette lookups while rendering r_pixbytes=4
extern int gl_anisotropy_factor;
@ -124,8 +119,6 @@ cvar_t r_novis = SCVAR ("r_novis", "0");
cvar_t r_part_rain = SCVARF ("r_part_rain", "0",
CVAR_ARCHIVE);
//whack in a value of 2 and you get easily visible players.
cvar_t r_sirds = SCVARF ("r_sirds", "0",
CVAR_SEMICHEAT);
cvar_t r_skyboxname = SCVARF ("r_skybox", "",
CVAR_RENDERERCALLBACK);
cvar_t r_speeds = SCVARF ("r_speeds", "0",

21
engine/client/sbar.c
View file

@ -2156,9 +2156,6 @@ void Sbar_Draw (void)
continue;
}
scr_copyeverything = 1;
// scr_fullupdate = 0;
sb_updates++;
// top line
@ -2297,9 +2294,6 @@ void Sbar_TeamOverlay (void)
return;
}
scr_copyeverything = 1;
scr_fullupdate = 0;
y = 0;
if (scr_scoreboard_drawtitle.value)
@ -2487,9 +2481,6 @@ void Sbar_DeathmatchOverlay (int start)
CL_SendClientCommand(true, "pings");
}
scr_copyeverything = 1;
scr_fullupdate = 0;
if (start)
y = start;
else
@ -2802,9 +2793,6 @@ void Sbar_ChatModeOverlay(void)
CL_SendClientCommand(true, "pings");
}
scr_copyeverything = 1;
scr_fullupdate = 0;
// scores
Sbar_SortFrags (true);
@ -2904,9 +2892,6 @@ void Sbar_MiniDeathmatchOverlay (void)
if (sbar_rect.width < 512 || !sb_lines)
return; // not enuff room
scr_copyeverything = 1;
scr_fullupdate = 0;
// scores
Sbar_SortFrags (false);
if (sbar_rect.width >= 640)
@ -3024,9 +3009,6 @@ void Sbar_CoopIntermission (void)
sbar_rect.x = 0;
sbar_rect.y = 0;
scr_copyeverything = 1;
scr_fullupdate = 0;
pic = Draw_SafeCachePic ("gfx/complete.lmp");
if (!pic)
return;
@ -3061,8 +3043,6 @@ Sbar_IntermissionOverlay
*/
void Sbar_IntermissionOverlay (void)
{
scr_copyeverything = 1;
scr_fullupdate = 0;
#ifdef VM_UI
if (UI_DrawIntermission()>0)
return;
@ -3089,7 +3069,6 @@ void Sbar_FinaleOverlay (void)
{
mpic_t *pic;
scr_copyeverything = 1;
#ifdef VM_UI
if (UI_DrawFinale()>0)
return;

6
engine/client/screen.h
View file

@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern float scr_con_current;
extern float scr_conlines; // lines of console to display
extern int scr_fullupdate; // set to 0 to force full redraw
extern int sb_lines;
extern int clearnotify; // set to 0 whenever notify text is drawn
@ -34,14 +33,9 @@ extern cvar_t scr_viewsize;
extern cvar_t scr_viewsize;
// only the refresh window will be updated unless these variables are flagged
extern int scr_copytop;
extern int scr_copyeverything;
qboolean scr_skipupdate;
qboolean SCR_RSShot (void);
qboolean block_drawing;
//void SCR_DrawConsole (qboolean noback);
//void SCR_SetUpToDrawConsole (void);

2
engine/client/sys_win.c
View file

@ -1496,7 +1496,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
{
#ifndef SERVERONLY
// yield the CPU for a little while when paused, minimized, or not the focus
if ((cl.paused || Minimized || block_drawing) && !Media_PlayingFullScreen())
if (cl.paused && !Media_PlayingFullScreen())
{
SleepUntilInput (PAUSE_SLEEP);
scr_skipupdate = 1; // no point in bothering to draw

4
engine/client/vid.h
View file

@ -51,7 +51,6 @@ typedef struct
{
pixel_t *buffer; // invisible buffer
pixel_t *colormap; // 256 * VID_GRADES size
unsigned short *colormap16; // 256 * VID_GRADES size
int fullbright; // index of first fullbright color
unsigned rowbytes; // may be > width if displayed in a window
unsigned width;
@ -72,11 +71,8 @@ typedef struct
} viddef_t;
extern viddef_t vid; // global video state
extern unsigned short d_8to16table[256];
extern unsigned int d_8to24bgrtable[256];
extern unsigned int d_8to24rgbtable[256];
extern unsigned int *d_8to32table;
#ifdef RGLQUAKE
void GLVID_SetPalette (unsigned char *palette);

9
engine/d3d/vid_d3d.c
View file

@ -811,17 +811,8 @@ void (D3D7_SCR_UpdateScreen) (void)
qboolean nohud;
RSpeedMark();
if (block_drawing)
{
RSpeedEnd(RSPEED_TOTALREFRESH);
return;
}
vid.numpages = 2;// + gl_triplebuffer.value;
scr_copytop = 0;
scr_copyeverything = 0;
if (scr_disabled_for_loading)
{
extern float scr_disabled_time;

10
engine/d3d9/vid_d3d9.c
View file

@ -1083,18 +1083,8 @@ void (D3D9_SCR_UpdateScreen) (void)
VID_ShiftPalette (NULL);
}
if (block_drawing)
{
RSpeedEnd(RSPEED_TOTALREFRESH);
return;
}
vid.numpages = 2;// + gl_triplebuffer.value;
scr_copytop = 0;
scr_copyeverything = 0;
if (scr_disabled_for_loading)
{
extern float scr_disabled_time;

9
engine/gl/gl_screen.c
View file

@ -171,17 +171,8 @@ void GLSCR_UpdateScreen (void)
qboolean noworld;
RSpeedMark();
if (block_drawing)
{
RSpeedEnd(RSPEED_TOTALREFRESH);
return;
}
vid.numpages = 2 + gl_triplebuffer.value;
scr_copytop = 0;
scr_copyeverything = 0;
if (scr_disabled_for_loading)
{
extern float scr_disabled_time;

2
engine/gl/gl_vidnt.c
View file

@ -1047,7 +1047,7 @@ void GL_DoSwap (void)
return;
screenflush = 0;
if (!scr_skipupdate || block_drawing)
if (!scr_skipupdate)
qSwapBuffers(maindc);
// handle the mouse state when windowed if that's changed