team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

random fixes. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4101 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-08-04 11:28:39 +00:00
parent 197f716f75
commit e759ac90bc
6 changed files with 675 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/client/cl_screen.c
View File

@ -1281,16 +1281,12 @@ void SCR_DrawFPS (void)
lastfps = 1/frametime;
lastupdatetime = t;
break;
#ifdef GLQUAKE
case 5:
if (qrenderer == QR_OPENGL)
GLR_FrameTimeGraph((int)(1000.0*2*frametime));
R_FrameTimeGraph((int)(1000.0*2*frametime));
break;
case 7:
if (qrenderer == QR_OPENGL)
GLR_FrameTimeGraph((int)(1000.0*1*frametime));
R_FrameTimeGraph((int)(1000.0*1*frametime));
break;
#endif
case 6:
{
float mean, deviation;
@ -2283,7 +2279,7 @@ void SCR_DrawTwoDimensional(int uimenu, qboolean nohud)
// draw any areas not covered by the refresh
//
if (r_netgraph.value)
GLR_NetGraph ();
R_NetGraph ();
if (scr_drawloading || loading_stage)
{

4
engine/client/screen.h
View File

@ -120,3 +120,7 @@ void Font_LineDraw(int x, int y, conchar_t *start, conchar_t *end);
extern struct font_s *font_conchar;
extern struct font_s *font_tiny;
/*end fonts*/
void R_NetgraphInit(void);
void R_NetGraph (void);
void R_FrameTimeGraph (int frametime);

903
engine/gl/gl_heightmap.c
View File

File diff suppressed because it is too large Load Diff

4
engine/gl/gl_ngraph.c
View File

@ -91,7 +91,7 @@ static void Draw_CharToNetGraph (int x, int y, int num)
R_NetGraph
==============
*/
void GLR_NetGraph (void)
void R_NetGraph (void)
{
int a, x, i, y;
int lost;
@ -127,7 +127,7 @@ void GLR_NetGraph (void)
R2D_Image(x, y, NET_TIMINGS, NET_GRAPHHEIGHT, 0, 0, 1, 1, netgraphshader);
}
void GLR_FrameTimeGraph (int frametime)
void R_FrameTimeGraph (int frametime)
{
int a, x, i, y;
int lost;

2
engine/gl/gl_vidnt.c
View File

@ -1929,7 +1929,9 @@ LONG WINAPI GLMainWndProc (
break;
case WM_USER:
#ifndef NOMEDIA
STT_Event();
#endif
break;
case WM_GETMINMAXINFO:

3
engine/gl/glquake.h
View File

@ -117,9 +117,6 @@ void GL_InitFogTexture(void);
void GL_BeginRendering (void);
void GL_EndRendering (void);
void R_NetgraphInit(void);
void GLR_NetGraph (void);
void GLR_FrameTimeGraph (int frametime);
void GL_FlushSkinCache(void);
void GL_GAliasFlushSkinCache(void);