diff options
| author | zakk <zakk@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-08-31 18:00:00 +0000 |
|---|---|---|
| committer | zakk <zakk@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-08-31 18:00:00 +0000 |
| commit | 227d86d227c6951ee2bd98388e7960c479c2b2e6 (patch) | |
| tree | 9a52b67cedd0be176d2b8a8be505a5b178f356b9 /code/client | |
| parent | 389b14cfcd3855222e0fafbbc40cbb71df595fef (diff) | |
| download | ioquake3-aero-227d86d227c6951ee2bd98388e7960c479c2b2e6.tar.gz ioquake3-aero-227d86d227c6951ee2bd98388e7960c479c2b2e6.zip | |
First diff from Andreas Schneider:
here are gcc4 signedness fixes for latest svn :)
git-svn-id: svn://svn.icculus.org/quake3/trunk@50 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/client')
| -rw-r--r-- | code/client/cl_main.c | 2 | ||||
| -rw-r--r-- | code/client/cl_net_chan.c | 2 | ||||
| -rw-r--r-- | code/client/snd_adpcm.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/code/client/cl_main.c b/code/client/cl_main.c index 61dbcc7..21075f2 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -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; diff --git a/code/client/cl_net_chan.c b/code/client/cl_net_chan.c index 904636e..f18e565 100644 --- a/code/client/cl_net_chan.c +++ b/code/client/cl_net_chan.c @@ -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 ); diff --git a/code/client/snd_adpcm.c b/code/client/snd_adpcm.c index 3e335fb..89e68f4 100644 --- a/code/client/snd_adpcm.c +++ b/code/client/snd_adpcm.c @@ -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; |