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

fix some warnings.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5380 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-01-13 17:56:26 +00:00
parent aaa78e5101
commit 960d1c3616
5 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/m_items.c
View file

@ -373,6 +373,8 @@ static qboolean M_MouseMoved(menu_t *menu)
switch(option->common.type) switch(option->common.type)
{ {
default:
break;
case mt_framestart: case mt_framestart:
ypos += framescroll; ypos += framescroll;
framescroll = 0; framescroll = 0;

1
engine/client/m_multi.c
View file

@ -445,7 +445,6 @@ void M_Menu_Setup_f (void)
"female", "female",
NULL NULL
}; };
mpic_t *p;
menucustom_t *cu; menucustom_t *cu;
Key_Dest_Add(kdm_emenu); Key_Dest_Add(kdm_emenu);

2
engine/common/q1bsp.c
View file

@ -721,7 +721,7 @@ static int Q1_HullPointContents (hull_t *hull, int num, vec3_t p)
#define DIST_EPSILON (0.03125) #define DIST_EPSILON (0.03125)
#if 1 #if 1
static const q1toftecontents[] = static const unsigned int q1toftecontents[] =
{ {
0,//EMPTY 0,//EMPTY
FTECONTENTS_SOLID,//SOLID FTECONTENTS_SOLID,//SOLID

32
engine/gl/gl_ngraph.c
View file

@ -41,48 +41,24 @@ static struct
} ngraph[NET_TIMINGS]; } ngraph[NET_TIMINGS];
#endif #endif
//instead of assuming the quake palette, we should use a predictable lookup table. it makes the docs much easier.
static unsigned ngraph_palette[] =
{
0xff00ffff, //yellow
0xff00efef, //yellow2
0xff0000ff, //red
0xff0000ef, //red2
0xffff0000, //blue
0xffef0000, //blue2
0xffffffff, //white
0xffefefef, //white2
0x00000000 //invisible.
};
static void R_LineGraph (int x, float h) static void R_LineGraph (int x, float h)
{ {
int s; int s;
unsigned color, color2; unsigned color;
s = NET_GRAPHHEIGHT; s = NET_GRAPHHEIGHT;
if (h == 10000 || h<0) if (h == 10000 || h<0)
{ {
color = 0xff00ffff; // yellow color = 0xff00ffff; // yellow
color2 = 0xff00efef;
h=fabs(h); h=fabs(h);
} }
else if (h == 9999) else if (h == 9999)
{
color = 0xff0000ff; // red color = 0xff0000ff; // red
color2 = 0xff0000ff;
}
else if (h == 9998) else if (h == 9998)
{
color = 0xffff0000; // blue color = 0xffff0000; // blue
color2 = 0xffef0000;
}
else else
{
color = 0xffffffff; // white color = 0xffffffff; // white
color2 = 0xffefefef;
}
#ifdef GRAPHTEX #ifdef GRAPHTEX
if (h>s) if (h>s)
@ -90,7 +66,7 @@ static void R_LineGraph (int x, float h)
for (i=0 ; i<h ; i++) for (i=0 ; i<h ; i++)
if (i & 1) if (i & 1)
ngraph_texels[NET_GRAPHHEIGHT - i - 1][x] = color2; ngraph_texels[NET_GRAPHHEIGHT - i - 1][x] = color&0xffefefef;
else else
ngraph_texels[NET_GRAPHHEIGHT - i - 1][x] = color; ngraph_texels[NET_GRAPHHEIGHT - i - 1][x] = color;
@ -114,7 +90,6 @@ void R_NetGraph (void)
{ {
int a, x, i; int a, x, i;
float y; float y;
int lost;
float pi, po, bi, bo; float pi, po, bi, bo;
vec2_t p[4]; vec2_t p[4];
@ -130,7 +105,6 @@ void R_NetGraph (void)
x = 0; x = 0;
if (r_netgraph.value < 0) if (r_netgraph.value < 0)
{ {
lost = -1;
if (!cl.paused) if (!cl.paused)
timehistory[++findex&NET_TIMINGSMASK] = (cl.currentpackentities?(cl.currentpackentities->servertime - cl.servertime)*NET_GRAPHHEIGHT*5:0); timehistory[++findex&NET_TIMINGSMASK] = (cl.currentpackentities?(cl.currentpackentities->servertime - cl.servertime)*NET_GRAPHHEIGHT*5:0);
for (a=0 ; a<NET_TIMINGS ; a++) for (a=0 ; a<NET_TIMINGS ; a++)
@ -142,7 +116,7 @@ void R_NetGraph (void)
else else
{ {
float last = 10000; float last = 10000;
lost = CL_CalcNet(r_netgraph.value); CL_CalcNet(r_netgraph.value);
for (a=0 ; a<NET_TIMINGS ; a++) for (a=0 ; a<NET_TIMINGS ; a++)
{ {
i = (cl.movesequence-a) & NET_TIMINGSMASK; i = (cl.movesequence-a) & NET_TIMINGSMASK;

3
engine/server/sv_move.c
View file

@ -168,8 +168,9 @@ qboolean World_movestep (world_t *world, wedict_t *ent, vec3_t move, vec3_t axis
#if defined(HEXEN2) && defined(HAVE_SERVER) #if defined(HEXEN2) && defined(HAVE_SERVER)
//hexen2 has some extra logic for FLH2_HUNTFACE, but its buggy and thus never used. //hexen2 has some extra logic for FLH2_HUNTFACE, but its buggy and thus never used.
//it would be nice to redefine the NOZ flag to instead force noenemy here, but that's not hexen2-compatible and FLH2_NOZ is bound to conflict with some quake mod. //it would be nice to redefine the NOZ flag to instead force noenemy here, but that's not hexen2-compatible and FLH2_NOZ is bound to conflict with some quake mod.
&& (world != &sv.world || progstype != PROG_H2 || !(eflags & (FLH2_NOZ|FLH2_HUNTFACE)))) && (world != &sv.world || progstype != PROG_H2 || !(eflags & (FLH2_NOZ|FLH2_HUNTFACE)))
#endif #endif
)
{ {
// try one move with vertical motion, then one without // try one move with vertical motion, then one without
for (i=0 ; i<2 ; i++) for (i=0 ; i<2 ; i++)