mirror of
https://github.com/UberGames/lilium-voyager.git
synced 2024-11-10 06:31:47 +00:00
First diff from Andreas Schneider:
here are gcc4 signedness fixes for latest svn :)
This commit is contained in:
parent
23d08fae65
commit
06c73f5e59
7 changed files with 16 additions and 11 deletions
|
@ -705,7 +705,12 @@ int PC_ExpandBuiltinDefine(source_t *source, token_t *deftoken, define_t *define
|
|||
token_t **firsttoken, token_t **lasttoken)
|
||||
{
|
||||
token_t *token;
|
||||
#ifdef _WIN32
|
||||
unsigned long t; // time_t t; //to prevent LCC warning
|
||||
#else
|
||||
time_t t;
|
||||
#endif
|
||||
|
||||
char *curtime;
|
||||
|
||||
token = PC_CopyToken(deftoken);
|
||||
|
|
|
@ -1543,7 +1543,7 @@ void CL_CheckForResend( void ) {
|
|||
data[10+i] = 0;
|
||||
|
||||
// NOTE TTimo don't forget to set the right data length!
|
||||
NET_OutOfBandData( NS_CLIENT, clc.serverAddress, &data[0], i+10 );
|
||||
NET_OutOfBandData( NS_CLIENT, clc.serverAddress, (byte *) &data[0], i+10 );
|
||||
// the most current userinfo has been sent, so watch for any
|
||||
// newer changes to userinfo variables
|
||||
cvar_modifiedFlags &= ~CVAR_USERINFO;
|
||||
|
|
|
@ -106,7 +106,7 @@ static void CL_Netchan_Decode( msg_t *msg ) {
|
|||
msg->bit = sbit;
|
||||
msg->readcount = srdc;
|
||||
|
||||
string = clc.reliableCommands[ reliableAcknowledge & (MAX_RELIABLE_COMMANDS-1) ];
|
||||
string = (byte *) clc.reliableCommands[ reliableAcknowledge & (MAX_RELIABLE_COMMANDS-1) ];
|
||||
index = 0;
|
||||
// xor the client challenge with the netchan sequence number (need something that changes every message)
|
||||
key = clc.challenge ^ LittleLong( *(unsigned *)msg->data );
|
||||
|
|
|
@ -278,7 +278,7 @@ void S_AdpcmGetSamples(sndBuffer *chunk, short *to) {
|
|||
|
||||
out = (byte *)chunk->sndChunk;
|
||||
// get samples
|
||||
S_AdpcmDecode( out, to, SND_CHUNK_SIZE_BYTE*2, &state );
|
||||
S_AdpcmDecode((char *) out, to, SND_CHUNK_SIZE_BYTE*2, &state );
|
||||
}
|
||||
|
||||
|
||||
|
@ -322,7 +322,7 @@ void S_AdpcmEncodeSound( sfx_t *sfx, short *samples ) {
|
|||
out = (byte *)chunk->sndChunk;
|
||||
|
||||
// encode the samples
|
||||
S_AdpcmEncode( samples + inOffset, out, n, &state );
|
||||
S_AdpcmEncode( samples + inOffset, (char *) out, n, &state );
|
||||
|
||||
inOffset += n;
|
||||
count -= n;
|
||||
|
|
|
@ -506,7 +506,7 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
|
|||
MSG_BeginReadingOOB( msg );
|
||||
MSG_ReadLong( msg ); // skip the -1 marker
|
||||
|
||||
if (!Q_strncmp("connect", &msg->data[4], 7)) {
|
||||
if (!Q_strncmp("connect", (char *) &msg->data[4], 7)) {
|
||||
Huff_Decompress(msg, 12);
|
||||
}
|
||||
|
||||
|
|
|
@ -678,7 +678,7 @@ static int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen )
|
|||
screen = vidscreen;
|
||||
|
||||
// bk001130 - from cvs1.17 (mkv)
|
||||
glstring = qglGetString (GL_RENDERER);
|
||||
glstring = (char *) qglGetString (GL_RENDERER);
|
||||
ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glstring );
|
||||
|
||||
// bk010122 - new software token (Indirect)
|
||||
|
@ -952,12 +952,12 @@ void GLimp_Init( void )
|
|||
glConfig.hardwareType = GLHW_GENERIC;
|
||||
|
||||
// get our config strings
|
||||
Q_strncpyz( glConfig.vendor_string, qglGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) );
|
||||
Q_strncpyz( glConfig.renderer_string, qglGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) );
|
||||
Q_strncpyz( glConfig.vendor_string, (char *) qglGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) );
|
||||
Q_strncpyz( glConfig.renderer_string, (char *) qglGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) );
|
||||
if (*glConfig.renderer_string && glConfig.renderer_string[strlen(glConfig.renderer_string) - 1] == '\n')
|
||||
glConfig.renderer_string[strlen(glConfig.renderer_string) - 1] = 0;
|
||||
Q_strncpyz( glConfig.version_string, qglGetString (GL_VERSION), sizeof( glConfig.version_string ) );
|
||||
Q_strncpyz( glConfig.extensions_string, qglGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) );
|
||||
Q_strncpyz( glConfig.version_string, (char *) qglGetString (GL_VERSION), sizeof( glConfig.version_string ) );
|
||||
Q_strncpyz( glConfig.extensions_string, (char *) qglGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) );
|
||||
|
||||
//
|
||||
// chipset specific configuration
|
||||
|
|
|
@ -159,7 +159,7 @@ qboolean Sys_GetPacket (netadr_t *net_from, msg_t *net_message)
|
|||
{
|
||||
int ret;
|
||||
struct sockaddr_in from;
|
||||
int fromlen;
|
||||
socklen_t fromlen;
|
||||
int net_socket;
|
||||
int protocol;
|
||||
int err;
|
||||
|
|
Loading…
Reference in a new issue