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

warning cleanup

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2221 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-04-16 03:55:55 +00:00
parent 219d49829d
commit f57808caf0
18 changed files with 38 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
engine/client/cl_ents.c
View file

@ -1488,7 +1488,6 @@ packet_entities_t *CL_ProcessPacketEntities(float *servertime, qboolean nolerp)
{
packet_entities_t *packnew, *packold;
int i;
static float oldoldtime;
//, spnum;
if (nolerp)

3
engine/client/cl_input.c
View file

@ -813,7 +813,6 @@ void CLNQ_SendCmd(void)
float CL_FilterTime (double time, float wantfps) //now returns the extra time not taken in this slot. Note that negative 1 means uncapped.
{
extern cvar_t rate;
float fps, fpscap;
if (cls.timedemo || cls.protocol == CP_QUAKE3)
@ -1061,8 +1060,6 @@ void CL_SendCmd (float frametime)
extern cvar_t cl_maxfps;
int cursor_entitynumber=0;//I hate warnings as errors
if (cls.demoplayback != DPB_NONE)
{
if (cls.demoplayback == DPB_MVD)

4
engine/client/cl_tent.c
View file

@ -2291,9 +2291,7 @@ void CLQ2_ParseTEnt (void)
// into a circle but it could be faked well enough, well except for
// the fact that these effects have ids associated with them
// sort of how beams have ents associated
{
int id = MSG_ReadShort();
}
MSG_ReadShort(); // id
if (P_RunParticleEffectTypeString(pos, NULL, 1, "te_widowbeamout"))
P_RunParticleEffect(pos, NULL, 13*8, 300);
break;

2
engine/client/clq2_ents.c
View file

@ -1610,6 +1610,7 @@ void CLQ2_AddPacketEntities (q2frame_t *frame)
renderfx |= Q2RF_SHELL_BLUE;
// if we have a blue shell (and not a red shell), turn it to cyan by adding green
else if (renderfx & Q2RF_SHELL_BLUE)
{
// go to green if it's on already, otherwise do cyan (flash green)
if (renderfx & Q2RF_SHELL_GREEN)
renderfx &= ~Q2RF_SHELL_BLUE;
@ -1617,6 +1618,7 @@ void CLQ2_AddPacketEntities (q2frame_t *frame)
renderfx |= Q2RF_SHELL_GREEN;
}
}
}
// pmm
ent.flags = renderfx | Q2RF_TRANSLUCENT;
ent.shaderRGBAf[3] = 0.30;

3
engine/client/in_win.c
View file

@ -64,6 +64,7 @@ cvar_t m_threshold_noforce = SCVAR("m_threshold_noforce", "0");
cvar_t cl_keypad = SCVAR("cl_keypad", "0");
qboolean CSQC_MouseMove(float xdelta, float ydelta);
qboolean Key_MouseShouldBeFree(void);
typedef struct {
union {
@ -1334,7 +1335,7 @@ void IN_MouseEvent (int mstate)
static void ProcessMouse(mouse_t *mouse, usercmd_t *cmd, int pnum)
{
extern int mouseusedforgui, mousecursor_x, mousecursor_y;
extern int mousecursor_x, mousecursor_y;
extern int mousemove_x, mousemove_y;
int mx, my;

1
engine/client/menu.h
View file

@ -271,6 +271,7 @@ menubutton_t *MC_AddCommand(menu_t *menu, int x, int y, char *text, qboolean (*c
menuedit_t *MC_AddEdit(menu_t *menu, int x, int y, char *text, char *def);
menuedit_t *MC_AddEditCvar(menu_t *menu, int x, int y, char *text, char *name);
menucustom_t *MC_AddCustom(menu_t *menu, int x, int y, void *data);
menucombo_t *MC_AddCvarCombo(menu_t *menu, int x, int y, const char *caption, cvar_t *cvar, const char **ops, const char **values);
menu_t *M_CreateMenu (int extrasize);
void M_AddMenu (menu_t *menu);

1
engine/common/common.h
View file

@ -329,6 +329,7 @@ int FS_Remove(char *fname, int relativeto); //0 on success, non-0 on error
qboolean FS_WriteFile (char *filename, void *data, int len, int relativeto);
vfsfile_t *FS_OpenVFS(char *filename, char *mode, int relativeto);
vfsfile_t *FS_OpenTemp(void);
vfsfile_t *FS_OpenTCP(char *name);
void FS_UnloadPackFiles(void);
void FS_ReloadPackFiles(void);
char *FS_GenerateClientPacksList(char *buffer, int maxlen, int basechecksum);

3
engine/common/net_wins.c
View file

@ -436,7 +436,8 @@ qboolean NET_StringToSockaddr (char *s, struct sockaddr_qstorage *sadr)
#ifdef IPPROTO_IPV6
if (pgetaddrinfo)
{
struct addrinfo *addrinfo, *pos;
struct addrinfo *addrinfo = NULL;
struct addrinfo *pos;
struct addrinfo udp6hint;
int error;
char *port;

37
engine/gl/gl_bloom.c
View file

@ -36,28 +36,28 @@ extern vrect_t scr_vrect;
*/
static float Diamond8x[8][8] = {
0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f,
0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f,
0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f,
0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f,
0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f,
0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f };
{0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f},
{0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f},
{0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f},
{0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f},
{0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f},
{0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f},
{0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f} };
static float Diamond6x[6][6] = {
0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f,
0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f,
0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f,
0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f,
0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f,
0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f };
{0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f},
{0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f},
{0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f},
{0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f},
{0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f},
{0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f} };
static float Diamond4x[4][4] = {
0.3f, 0.4f, 0.4f, 0.3f,
0.4f, 0.9f, 0.9f, 0.4f,
0.4f, 0.9f, 0.9f, 0.4f,
0.3f, 0.4f, 0.4f, 0.3f };
{0.3f, 0.4f, 0.4f, 0.3f},
{0.4f, 0.9f, 0.9f, 0.4f},
{0.4f, 0.9f, 0.9f, 0.4f},
{0.3f, 0.4f, 0.4f, 0.3f} };
static int BLOOM_SIZE;
@ -187,7 +187,6 @@ R_Bloom_InitTextures
*/
void R_Bloom_InitTextures( void )
{
extern int gl_filter_max;
qbyte *data;
int size;
int maxtexsize;

2
engine/gl/gl_rmain.c
View file

@ -231,8 +231,6 @@ void GL_InitSceneProcessingShaders_WaterWarp (void)
void GL_InitSceneProcessingShaders_MenuTint(void)
{
static vec3_t defaultcolor = {1, 1, 1};
char *vshader = "\
varying vec2 texcoord;\
void main(void)\

4
engine/gl/gl_shader.c
View file

@ -541,7 +541,7 @@ static void Shader_EntityMergable ( shader_t *shader, shaderpass_t *pass, char *
static void Shader_ProgramName ( shader_t *shader, shaderpass_t *pass, char **ptr )
{
char *vert, *frag;
void *vert, *frag;
char *token;
if (shader->programhandle)
{ //this allows fallbacks
@ -554,7 +554,7 @@ static void Shader_ProgramName ( shader_t *shader, shaderpass_t *pass, char **pt
token = Shader_ParseString ( ptr );
FS_LoadFile(token, &frag);
if (vert && frag)
shader->programhandle = GLSlang_CreateProgram("", vert, frag);
shader->programhandle = GLSlang_CreateProgram("", (char *)vert, (char *)frag);
if (vert)
FS_FreeFile(vert);
if (frag)

8
engine/qclib/qcc_cmdlib.c
View file

@ -52,10 +52,10 @@ long QCC_SwapLong (long l)
{
qbyte b1,b2,b3,b4;
b1 = l&255;
b2 = (l>>8)&255;
b3 = (l>>16)&255;
b4 = (l>>24)&255;
b1 = (qbyte)l;
b2 = (qbyte)(l>>8);
b3 = (qbyte)(l>>16);
b4 = (qbyte)(l>>24);
return ((long)b1<<24) + ((long)b2<<16) + ((long)b3<<8) + b4;
}

1
engine/server/pr_cmds.c
View file

@ -6480,7 +6480,6 @@ int PR_EnableEBFSBuiltin(char *name, int binum)
lh_extension_t *checkfteextensioncl(int mask, char *name) //true if the cient extension mask matches an extension name
{
int i;
unsigned int m = 1;
for (i = 0; i < sizeof(FTE_Protocol_Extensions)/sizeof(lh_extension_t); i++)
{
if (mask & (1<<i)) //suported

2
engine/server/savegame.c
View file

@ -33,7 +33,7 @@ void SV_SavegameComment (char *text)
#ifdef Q2SERVER
if (ge) //q2
{
sprintf (kills,"");
kills[0] = '\0';
}
else
#endif

1
engine/server/sv_main.c
View file

@ -178,6 +178,7 @@ vfsfile_t *sv_fraglogfile;
void SV_FixupName(char *in, char *out);
void SV_AcceptClient (netadr_t adr, int userid, char *userinfo);
void Master_Shutdown (void);
void PR_SetPlayerClass(client_t *cl, int classnum, qboolean fromqc);
//============================================================================

1
engine/sw/r_aclip.c
View file

@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "d_local.h"
static finalvert_t fv[2][8];
static mstvert_t fstv[2][8];
static auxvert_t av[8];
void R_AliasProjectFinalVert (finalvert_t *fv, auxvert_t *av);

4
engine/sw/r_alias.c
View file

@ -62,8 +62,6 @@ static model_t *pmodel;
extern int cl_playerindex;
static vec3_t alias_forward, alias_right, alias_up;
static maliasskindesc_t *pskindesc;
int r_amodels_drawn;
@ -366,7 +364,6 @@ void R_AliasPreparePoints (void)
if ( ! ( (pfv[0]->flags | pfv[1]->flags | pfv[2]->flags) &
(ALIAS_XY_CLIP_MASK | ALIAS_Z_CLIP) ) )
{ // totally unclipped
extern int r_p0[6], r_p1[6], r_p2[6];
r_affinetridesc.pfinalverts = pfinalverts;
r_affinetridesc.ptriangles = ptri;
@ -389,7 +386,6 @@ void R_AliasSetUpTransform (int trivial_accept)
{
int i;
float rotationmatrix[3][4], t2matrix[3][4];
static float tmatrix[3][4];
static float viewmatrix[3][4];
for (i=0 ; i<3 ; i++)

6
engine/sw/sw_draw.c
View file

@ -790,9 +790,9 @@ void SWDraw_ColouredCharacter (int x, int y, unsigned int num)
{
if (source[i])
{
dest16[i] = ((((128+pal[source[i]*4+0]*ib_ri)>>12)<<10) + ((dest16[i]&0x7B00)>>1)) |
dest16[i] = (((((128+pal[source[i]*4+0]*ib_ri)>>12)<<10) + ((dest16[i]&0x7B00)>>1)) |
((((128+pal[source[i]*4+1]*ib_gi)>>12)<<5) + ((dest16[i]&0x03D0)>>1)) |
((128+pal[source[i]*4+2]*ib_bi)>>12) + ((dest16[i]&0x001E)>>1);
((128+pal[source[i]*4+2]*ib_bi)>>12)) + ((dest16[i]&0x001E)>>1);
}
}
source += 128;
@ -919,7 +919,7 @@ qbyte *COM_LoadFile (char *path, int usehunk);
void SWDraw_Crosshair(void)
{
int x, y;
extern cvar_t crosshair, cl_crossx, cl_crossy, crosshaircolor;
extern cvar_t crosshair, cl_crossx, cl_crossy;
extern vrect_t scr_vrect;
qbyte c, c2;
int sc;