fix some warnings and stuff
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5181 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
559144cb05
commit
0b5bc85c91
6 changed files with 12 additions and 12 deletions
|
@ -1409,10 +1409,10 @@ void CL_Rcon_f (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
message[0] = 255;
|
message[0] = (char)255;
|
||||||
message[1] = 255;
|
message[1] = (char)255;
|
||||||
message[2] = 255;
|
message[2] = (char)255;
|
||||||
message[3] = 255;
|
message[3] = (char)255;
|
||||||
message[4] = 0;
|
message[4] = 0;
|
||||||
|
|
||||||
Q_strncatz (message, "rcon ", sizeof(message));
|
Q_strncatz (message, "rcon ", sizeof(message));
|
||||||
|
|
|
@ -26,7 +26,7 @@ void *wadmutex;
|
||||||
#ifndef PACKAGE_TEXWAD
|
#ifndef PACKAGE_TEXWAD
|
||||||
void Wads_Flush (void){}
|
void Wads_Flush (void){}
|
||||||
qboolean Wad_NextDownload (void){return true;}
|
qboolean Wad_NextDownload (void){return true;}
|
||||||
void *W_SafeGetLumpName (const char *name, size_t *size) {return NULL;}
|
void *W_GetLumpName (const char *name, size_t *size, qbyte *type) {return NULL;}
|
||||||
qbyte *W_GetTexture(const char *name, int *width, int *height, qboolean *usesalpha){return NULL;}
|
qbyte *W_GetTexture(const char *name, int *width, int *height, qboolean *usesalpha){return NULL;}
|
||||||
void W_LoadWadFile (char *filename){}
|
void W_LoadWadFile (char *filename){}
|
||||||
void W_Shutdown (void){}
|
void W_Shutdown (void){}
|
||||||
|
|
|
@ -3789,7 +3789,7 @@ void CL_Say (qboolean team, char *extra)
|
||||||
if (*s == 'z')
|
if (*s == 'z')
|
||||||
*d++ = 'x';
|
*d++ = 'x';
|
||||||
else
|
else
|
||||||
*d++ = 139;
|
*d++ = (char)139;
|
||||||
|
|
||||||
*d++ = '^';
|
*d++ = '^';
|
||||||
*d++ = 'r';
|
*d++ = 'r';
|
||||||
|
|
|
@ -1722,7 +1722,7 @@ struct font_s *Font_LoadFont(float vheight, const char *fontfilename)
|
||||||
FMT_QUAKE, //first is default
|
FMT_QUAKE, //first is default
|
||||||
FMT_ISO88591, //latin-1 (first 256 chars of unicode too)
|
FMT_ISO88591, //latin-1 (first 256 chars of unicode too)
|
||||||
FMT_HORIZONTAL, //unicode, charcount=width/(height-2). single strip of chars, like halflife.
|
FMT_HORIZONTAL, //unicode, charcount=width/(height-2). single strip of chars, like halflife.
|
||||||
} fmt;
|
} fmt = FMT_AUTO;
|
||||||
|
|
||||||
Q_strncpy(facename, fontfilename, sizeof(facename));
|
Q_strncpy(facename, fontfilename, sizeof(facename));
|
||||||
|
|
||||||
|
|
|
@ -230,10 +230,10 @@ static void Mod_BlockTextureColour_f (void)
|
||||||
// unsigned int colour[8*8];
|
// unsigned int colour[8*8];
|
||||||
unsigned int rgba;
|
unsigned int rgba;
|
||||||
|
|
||||||
((char *)&rgba)[0] = atoi(Cmd_Argv(2));
|
((qbyte *)&rgba)[0] = atoi(Cmd_Argv(2));
|
||||||
((char *)&rgba)[1] = atoi(Cmd_Argv(3));
|
((qbyte *)&rgba)[1] = atoi(Cmd_Argv(3));
|
||||||
((char *)&rgba)[2] = atoi(Cmd_Argv(4));
|
((qbyte *)&rgba)[2] = atoi(Cmd_Argv(4));
|
||||||
((char *)&rgba)[3] = 255;
|
((qbyte *)&rgba)[3] = 255;
|
||||||
|
|
||||||
sprintf(texname, "purergb_%i_%i_%i", (int)((char *)&rgba)[0], (int)((char *)&rgba)[1], (int)((char *)&rgba)[2]);
|
sprintf(texname, "purergb_%i_%i_%i", (int)((char *)&rgba)[0], (int)((char *)&rgba)[1], (int)((char *)&rgba)[2]);
|
||||||
/* s = R_RegisterCustom(Cmd_Argv(2), SUF_LIGHTMAP, NULL, NULL);
|
/* s = R_RegisterCustom(Cmd_Argv(2), SUF_LIGHTMAP, NULL, NULL);
|
||||||
|
|
|
@ -1357,7 +1357,7 @@ static const char *lastfile = 0;
|
||||||
if (debugaction == DEBUG_TRACE_NORESUME)
|
if (debugaction == DEBUG_TRACE_NORESUME)
|
||||||
continue;
|
continue;
|
||||||
else if(debugaction == DEBUG_TRACE_ABORT)
|
else if(debugaction == DEBUG_TRACE_ABORT)
|
||||||
progfuncs->funcs.parms->Abort (fault?fault:"Debugger Abort");
|
progfuncs->funcs.parms->Abort ("%s", fault?fault:"Debugger Abort");
|
||||||
else if (debugaction == DEBUG_TRACE_OFF)
|
else if (debugaction == DEBUG_TRACE_OFF)
|
||||||
{
|
{
|
||||||
//if we're resuming, don't hit any lingering step-over triggers
|
//if we're resuming, don't hit any lingering step-over triggers
|
||||||
|
|
Loading…
Reference in a new issue