Moved declaration of COM_FileSize to common.h to fix warnings. Fixed one GCC warning in pr_cmds.c, added one ifdef in gl_alias.c
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2594 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
e7022fd2df
commit
d1907666fb
6 changed files with 4 additions and 6 deletions
|
@ -3452,7 +3452,6 @@ static progparms_t csqcprogparms;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int COM_FileSize(char *path);
|
|
||||||
pbool QC_WriteFile(char *name, void *data, int len);
|
pbool QC_WriteFile(char *name, void *data, int len);
|
||||||
void *VARGS PR_CB_Malloc(int size); //these functions should be tracked by the library reliably, so there should be no need to track them ourselves.
|
void *VARGS PR_CB_Malloc(int size); //these functions should be tracked by the library reliably, so there should be no need to track them ourselves.
|
||||||
void VARGS PR_CB_Free(void *mem);
|
void VARGS PR_CB_Free(void *mem);
|
||||||
|
|
|
@ -1372,7 +1372,6 @@ void MP_Shutdown (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int COM_FileSize(char *path);
|
|
||||||
pbool QC_WriteFile(char *name, void *data, int len);
|
pbool QC_WriteFile(char *name, void *data, int len);
|
||||||
void *VARGS PR_CB_Malloc(int size); //these functions should be tracked by the library reliably, so there should be no need to track them ourselves.
|
void *VARGS PR_CB_Malloc(int size); //these functions should be tracked by the library reliably, so there should be no need to track them ourselves.
|
||||||
void VARGS PR_CB_Free(void *mem);
|
void VARGS PR_CB_Free(void *mem);
|
||||||
|
|
|
@ -255,6 +255,7 @@ void COM_ParsePlusSets (void);
|
||||||
char *COM_SkipPath (char *pathname);
|
char *COM_SkipPath (char *pathname);
|
||||||
void COM_StripExtension (char *in, char *out, int outlen);
|
void COM_StripExtension (char *in, char *out, int outlen);
|
||||||
void COM_FileBase (char *in, char *out, int outlen);
|
void COM_FileBase (char *in, char *out, int outlen);
|
||||||
|
int COM_FileSize(char *path);
|
||||||
void COM_DefaultExtension (char *path, char *extension, int maxlen);
|
void COM_DefaultExtension (char *path, char *extension, int maxlen);
|
||||||
void COM_DeFunString(unsigned long *str, char *out, int outsize, qboolean ignoreflags);
|
void COM_DeFunString(unsigned long *str, char *out, int outsize, qboolean ignoreflags);
|
||||||
void COM_ParseFunString(char *str, unsigned long *out, int outsize);
|
void COM_ParseFunString(char *str, unsigned long *out, int outsize);
|
||||||
|
|
|
@ -20,7 +20,6 @@ cvar_t log_rotate_size = SCVARF("log_rotate_size", "131072", CVAR_NOTFROMSERVER
|
||||||
cvar_t log_dosformat = SCVARF("log_dosformat", "0", CVAR_NOTFROMSERVER);
|
cvar_t log_dosformat = SCVARF("log_dosformat", "0", CVAR_NOTFROMSERVER);
|
||||||
|
|
||||||
// externals
|
// externals
|
||||||
int COM_FileSize(char *path);
|
|
||||||
extern char gamedirfile[];
|
extern char gamedirfile[];
|
||||||
|
|
||||||
// table of readable characters, same as ezquake
|
// table of readable characters, same as ezquake
|
||||||
|
|
|
@ -29,7 +29,9 @@
|
||||||
|
|
||||||
#define MAX_BONES 256
|
#define MAX_BONES 256
|
||||||
|
|
||||||
|
#ifndef SERVERONLY
|
||||||
static model_t *loadmodel;
|
static model_t *loadmodel;
|
||||||
|
#endif
|
||||||
|
|
||||||
//FIXME
|
//FIXME
|
||||||
typedef struct
|
typedef struct
|
||||||
|
|
|
@ -140,8 +140,6 @@ char *QC_ProgsNameForEnt(edict_t *ent)
|
||||||
|
|
||||||
int pr_edict_size;
|
int pr_edict_size;
|
||||||
|
|
||||||
int COM_FileSize(char *path);
|
|
||||||
|
|
||||||
pbool QC_WriteFile(char *name, void *data, int len)
|
pbool QC_WriteFile(char *name, void *data, int len)
|
||||||
{
|
{
|
||||||
char buffer[256];
|
char buffer[256];
|
||||||
|
@ -9268,7 +9266,7 @@ void PF_matchclient(progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
else
|
else
|
||||||
G_INT(OFS_RETURN) = (cl - svs.clients) + 1;
|
G_INT(OFS_RETURN) = (cl - svs.clients) + 1;
|
||||||
|
|
||||||
if (cl = SV_GetClientForString(name, &clnum))
|
if ((cl = SV_GetClientForString(name, &clnum)))
|
||||||
G_INT(OFS_RETURN) = 0; //prevent multiple matches.
|
G_INT(OFS_RETURN) = 0; //prevent multiple matches.
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue