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
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue