1
0
Fork 0
forked from fte/fteqw

fixed msvc6 warnings

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1896 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Lance 2006-01-27 08:12:14 +00:00
parent 20ef474862
commit 07a1fb3ba1
9 changed files with 39 additions and 15 deletions

View file

@ -1636,6 +1636,10 @@ void CL_LinkPacketEntities (void)
else else
{ {
#ifdef SWQUAKE #ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
ent->palremap = D_IdentityRemap(); ent->palremap = D_IdentityRemap();
#endif #endif
ent->scoreboard = NULL; ent->scoreboard = NULL;
@ -2202,6 +2206,9 @@ void CL_LinkProjectiles (void)
ent->frame = 0; ent->frame = 0;
ent->flags = 0; ent->flags = 0;
#ifdef SWQUAKE #ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
ent->palremap = D_IdentityRemap(); ent->palremap = D_IdentityRemap();
#endif #endif
ent->scoreboard = NULL; ent->scoreboard = NULL;

View file

@ -938,7 +938,7 @@ int blockcycle;
void CL_ParseChunkedDownload(void) void CL_ParseChunkedDownload(void)
{ {
qbyte *svname; qbyte *svname;
qbyte osname[MAX_OSPATH]; //qbyte osname[MAX_OSPATH]; //unreferenced
int totalsize; int totalsize;
int chunknum; int chunknum;
char data[DLBLOCKSIZE]; char data[DLBLOCKSIZE];
@ -2353,6 +2353,10 @@ void CL_ParseStatic (int version)
ent->model = cl.model_precache[es.modelindex]; ent->model = cl.model_precache[es.modelindex];
ent->oldframe = ent->frame = es.frame; ent->oldframe = ent->frame = es.frame;
#ifdef SWQUAKE #ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
ent->palremap = D_IdentityRemap(); ent->palremap = D_IdentityRemap();
#endif #endif
ent->skinnum = es.skinnum; ent->skinnum = es.skinnum;
@ -2627,9 +2631,9 @@ CL_NewTranslation
void CL_NewTranslation (int slot) void CL_NewTranslation (int slot)
{ {
#ifdef SWQUAKE #ifdef SWQUAKE
int i, j; //int i, j; //unreferenced
int top, bottom; int top, bottom;
qbyte *dest, *source; //qbyte *dest, *source; //unreferenced
int local; int local;
#endif #endif

View file

@ -2312,6 +2312,10 @@ entity_t *CL_NewTempEntity (void)
memset (ent, 0, sizeof(*ent)); memset (ent, 0, sizeof(*ent));
#ifdef SWQUAKE #ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
ent->palremap = D_IdentityRemap(); ent->palremap = D_IdentityRemap();
#endif #endif
#ifdef PEXT_SCALE #ifdef PEXT_SCALE

View file

@ -499,7 +499,8 @@ typedef struct q3refEntity_s {
// texturing // texturing
int skinNum; // inline skin index int skinNum; // inline skin index
int customSkin; // NULL for default skin //int customSkin; // NULL for default skin
char *customSkin; //the function that references this wants a char* not an int
int customShader; // use one image for the entire thing int customShader; // use one image for the entire thing
// misc // misc

View file

@ -1669,7 +1669,7 @@ void Media_RecordDemo_f(void)
void Media_CaptureDemoEnd(void){} void Media_CaptureDemoEnd(void){}
void Media_RecordAudioFrame (short *sample_buffer, int samples){} void Media_RecordAudioFrame (short *sample_buffer, int samples){}
void Media_RecordFrame (void) {} void Media_RecordFrame (void) {}
void Media_PausedDemo (void) {return false;} void Media_PausedDemo (void) {} //should not return a value
#endif #endif
void Media_Init(void) void Media_Init(void)
{ {

View file

@ -1772,6 +1772,10 @@ TRACE(("dbg: R_ApplyRenderer: efrags\n"));
{ {
cl_static_entities[i].model = cl.model_precache[staticmodelindex[i]]; cl_static_entities[i].model = cl.model_precache[staticmodelindex[i]];
#ifdef SWQUAKE #ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
cl_static_entities[i].palremap = D_IdentityRemap(); cl_static_entities[i].palremap = D_IdentityRemap();
#endif #endif
if (staticmodelindex[i]) //make sure it's worthwhile. if (staticmodelindex[i]) //make sure it's worthwhile.

View file

@ -50,13 +50,13 @@ qbyte *COM_LoadFile (char *path, int usehunk);
sfxcache_t *S_LoadOVSound (sfx_t *s, qbyte *data, int datalen, int sndspeed) sfxcache_t *S_LoadOVSound (sfx_t *s, qbyte *data, int datalen, int sndspeed)
{ {
char namebuffer[MAX_OSPATH]; //char namebuffer[MAX_OSPATH]; //unreferenced
char *name; char *name;
ovdecoderbuffer_t *buffer; ovdecoderbuffer_t *buffer;
FILE *f; //FILE *f; //unreferenced
qboolean telluser; //qboolean telluser; //unreferenced
int len; //int len; //unreferenced
name = s->name; name = s->name;

View file

@ -126,11 +126,11 @@ void ValidationPrintVersion(char *f_query_string)
{ {
f_query_t *this_query; f_query_t *this_query;
unsigned short query_crc; unsigned short query_crc;
unsigned long crc; //unsigned long crc; //unreferenced
char answer; //char answer; //unreferenced
char name[128]; //char name[128]; //unrefernced
char sr[256]; char sr[256];
char *s; char *s; // unreferenced in software only client
int i; int i;
extern cvar_t r_shadow_realtime_world, r_drawflat; extern cvar_t r_shadow_realtime_world, r_drawflat;
@ -323,9 +323,9 @@ void Validation_CheckIfResponse(char *text)
unsigned short query_crc = 0; unsigned short query_crc = 0;
unsigned long user_crc = 0; unsigned long user_crc = 0;
unsigned long auth_crc = 0; unsigned long auth_crc = 0;
char auth_answer; //char auth_answer; //unreferenced
int slot; //int slot; //unreferenced
signed_buffer_t *resp; signed_buffer_t *resp;
//easy lame way to get the crc from hex. //easy lame way to get the crc from hex.

View file

@ -1185,6 +1185,10 @@ void V_CalcRefdef (int pnum)
view->model = cl.model_precache[cl.stats[pnum][STAT_WEAPON]]; view->model = cl.model_precache[cl.stats[pnum][STAT_WEAPON]];
view->frame = view_message?view_message->weaponframe:0; view->frame = view_message?view_message->weaponframe:0;
#ifdef SWQUAKE #ifdef SWQUAKE
//if they're in different files it's probably just the compiler not knowing the return type when it reaches that line so it guesses int
//timeserv thinks we need a prototype (whatever that is) ~ Moodles
#pragma warning(disable:4047)
view->palremap = D_IdentityRemap(); view->palremap = D_IdentityRemap();
#endif #endif