diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2008-03-26 20:17:21 +0000 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2008-03-26 20:17:21 +0000 |
| commit | 2e5bdb7d4141cd6eb690ceca234fd2cf62410cff (patch) | |
| tree | 7d5a1500d396ad593036fa260e57c67438844ab4 /source/snd_mem.c | |
| parent | a2b6e72158970ffbe789776649c07107b9cfb553 (diff) | |
CM loading code no longer calls Com_Error.
Made endianness conversion macros return unsigned integers.
Diffstat (limited to 'source/snd_mem.c')
| -rw-r--r-- | source/snd_mem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/snd_mem.c b/source/snd_mem.c index 4f79ae0..8e2593c 100644 --- a/source/snd_mem.c +++ b/source/snd_mem.c @@ -66,11 +66,11 @@ static sfxcache_t *ResampleSfx( sfx_t *sfx, wavinfo_t *info ) { // fast special case if( sc->width == 1 ) { for(i = 0; i < outcount; i++) { - ((signed char *)sc->data)[i] = (int)( (unsigned char)info->data[i] - 128 ); + ((signed char *)sc->data)[i] = ( signed char )( ( uint8_t )info->data[i] - 128 ); } } else { for(i = 0; i < outcount; i++) { - ((signed short *)sc->data)[i] = LittleShort( ((signed short *)info->data)[i] ); + ((signed short *)sc->data)[i] = ( signed short )LittleShort( (( uint16_t * )info->data)[i] ); } } } else { @@ -81,13 +81,13 @@ static sfxcache_t *ResampleSfx( sfx_t *sfx, wavinfo_t *info ) { for (i = 0; i < outcount; i++) { srcsample = samplefrac >> 8; samplefrac += fracstep; - ((signed char *)sc->data)[i] = (int)( (unsigned char)info->data[srcsample] - 128 ); + ((signed char *)sc->data)[i] = ( signed char )( ( uint8_t )info->data[srcsample] - 128 ); } } else { for (i = 0; i < outcount; i++) { srcsample = samplefrac >> 8; samplefrac += fracstep; - ((signed short *)sc->data)[i] = LittleShort( ((signed short *)info->data)[srcsample] ); + ((signed short *)sc->data)[i] = ( signed short )LittleShort( (( uint16_t * )info->data)[srcsample] ); } } } |