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

Trying to fix the remaining warnings. Is this correct? Builds that now compiles with no warnings in VS 2005: Debug, Debug Dedicated Server and GLDebug.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2586 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Molgrum 2007-08-08 02:37:59 +00:00
parent 2dfb03ee03
commit cf1a12ee11
6 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
engine/client/cl_parse.c
View file

@ -1426,20 +1426,20 @@ void CLDP_ParseDownloadFinished(char *s)
QCRC_AddBlock(&runningcrc, buffer, chunk); QCRC_AddBlock(&runningcrc, buffer, chunk);
} }
VFS_CLOSE (cls.downloadqw); VFS_CLOSE (cls.downloadqw);
}
Cmd_TokenizeString(s+1, false, false); Cmd_TokenizeString(s+1, false, false);
if (size != atoi(Cmd_Argv(1))) if (size != atoi(Cmd_Argv(1)))
{ {
Con_Printf("Download failed: wrong file size\n"); Con_Printf("Download failed: wrong file size\n");
CL_DownloadFailed(cls.downloadname); CL_DownloadFailed(cls.downloadname);
return; return;
} }
if (runningcrc != atoi(Cmd_Argv(2))) if (runningcrc != atoi(Cmd_Argv(2)))
{ {
Con_Printf("Download failed: wrong crc\n"); Con_Printf("Download failed: wrong crc\n");
CL_DownloadFailed(cls.downloadname); CL_DownloadFailed(cls.downloadname);
return; return;
}
} }
CL_FinishDownload(cls.downloadname, cls.downloadtempname); CL_FinishDownload(cls.downloadname, cls.downloadtempname);

2
engine/common/common.c
View file

@ -1798,7 +1798,7 @@ messedup:
int COM_FunStringLength(unsigned char *str) int COM_FunStringLength(unsigned char *str)
{ {
int len; int len = 0;
while(*str) while(*str)
{ {

4
engine/gl/gl_alias.c
View file

@ -2619,6 +2619,7 @@ void R_DrawGAliasShadowVolume(entity_t *e, vec3_t lightpos, float radius)
#if 0
static int R_FindTriangleWithEdge ( index_t *indexes, int numtris, index_t start, index_t end, int ignore) static int R_FindTriangleWithEdge ( index_t *indexes, int numtris, index_t start, index_t end, int ignore)
{ {
int i; int i;
@ -2648,7 +2649,9 @@ static int R_FindTriangleWithEdge ( index_t *indexes, int numtris, index_t start
return match; return match;
} }
#endif
#if 0
static void R_BuildTriangleNeighbours ( int *neighbours, index_t *indexes, int numtris ) static void R_BuildTriangleNeighbours ( int *neighbours, index_t *indexes, int numtris )
{ {
int i, *n; int i, *n;
@ -2661,6 +2664,7 @@ static void R_BuildTriangleNeighbours ( int *neighbours, index_t *indexes, int n
n[2] = R_FindTriangleWithEdge (indexes, numtris, index[0], index[2], i); n[2] = R_FindTriangleWithEdge (indexes, numtris, index[0], index[2], i);
} }
} }
#endif

10
engine/qclib/pr_edict.c
View file

@ -25,7 +25,7 @@ vec3_t vec3_origin;
//int pr_max_edict_size; //int pr_max_edict_size;
//unsigned short pr_crc; //unsigned short pr_crc;
const int type_size[12] = {1, //void const unsigned int type_size[12] = {1, //void
sizeof(string_t)/4, //string sizeof(string_t)/4, //string
1, //float 1, //float
3, //vector 3, //vector
@ -865,7 +865,7 @@ void ED_Print (progfuncs_t *progfuncs, struct edict_s *ed)
int l; int l;
fdef_t *d; fdef_t *d;
int *v; int *v;
unsigned int i;int j; unsigned int i;unsigned int j;
char *name; char *name;
int type; int type;
@ -1228,7 +1228,7 @@ char *ED_WriteGlobals(progfuncs_t *progfuncs, char *buffer) //switch first.
ddef32_t *def32; ddef32_t *def32;
ddef16_t *def16; ddef16_t *def16;
unsigned int i; unsigned int i;
int j; unsigned int j;
char *name; char *name;
int type; int type;
int curprogs = pr_typecurrent; int curprogs = pr_typecurrent;
@ -1366,7 +1366,7 @@ char *ED_WriteEdict(progfuncs_t *progfuncs, edictrun_t *ed, char *buffer, pbool
fdef_t *d; fdef_t *d;
int *v; int *v;
unsigned int i;int j; unsigned int i;unsigned int j;
char *name; char *name;
int type; int type;
int len; int len;
@ -2096,7 +2096,7 @@ char *SaveEnt (progfuncs_t *progfuncs, char *buf, int *size, struct edict_s *ed)
{ {
fdef_t *d; fdef_t *d;
int *v; int *v;
unsigned int i;int j; unsigned int i;unsigned int j;
char *name; char *name;
int type; int type;

6
engine/qclib/progsint.h
View file

@ -273,7 +273,7 @@ unsigned int NUM_FOR_EDICT(progfuncs_t *progfuncs, struct edict_s *e);
#define E_VECTOR(e,o) (&((float*)&e->v)[o]) #define E_VECTOR(e,o) (&((float*)&e->v)[o])
#define E_STRING(e,o) (*(string_t *)&((float*)(e+1))[o]) #define E_STRING(e,o) (*(string_t *)&((float*)(e+1))[o])
const extern int type_size[]; const extern unsigned int type_size[];
extern unsigned short pr_crc; extern unsigned short pr_crc;
@ -408,9 +408,9 @@ var(evalc_t, spawnflagscache);
var(int, fields_size); // in bytes var(unsigned int, fields_size); // in bytes
#define fields_size prinst->fields_size #define fields_size prinst->fields_size
var(int, max_fields_size); var(unsigned int, max_fields_size);
#define max_fields_size prinst->max_fields_size #define max_fields_size prinst->max_fields_size

2
engine/qclib/qcc.h
View file

@ -370,7 +370,7 @@ typedef union QCC_eval_s
union QCC_eval_s *ptr; union QCC_eval_s *ptr;
} QCC_eval_t; } QCC_eval_t;
const extern int type_size[]; const extern unsigned int type_size[];
//extern QCC_def_t *def_for_type[9]; //extern QCC_def_t *def_for_type[9];
extern QCC_type_t *type_void, *type_string, *type_float, *type_vector, *type_entity, *type_field, *type_function, *type_pointer, *type_integer, *type_variant, *type_floatfield; extern QCC_type_t *type_void, *type_string, *type_float, *type_vector, *type_entity, *type_field, *type_function, *type_pointer, *type_integer, *type_variant, *type_floatfield;