diff --git a/3rdparty/library_suffix b/3rdparty/library_suffix index 6e14ae31..2cb2a0e1 160000 --- a/3rdparty/library_suffix +++ b/3rdparty/library_suffix @@ -1 +1 @@ -Subproject commit 6e14ae31e86ba4cbab22f14dd439b17f76d3c5ba +Subproject commit 2cb2a0e12018c8e0a3f1bb727835e6335363e9aa diff --git a/common/xash3d_types.h b/common/xash3d_types.h index 405b14c3..4bf1de87 100644 --- a/common/xash3d_types.h +++ b/common/xash3d_types.h @@ -243,7 +243,7 @@ typedef int qboolean; #define Swap32Store( x ) ( x = Swap32( x )) #define Swap16Store( x ) ( x = Swap16( x )) -#ifdef XASH_BIG_ENDIAN +#if XASH_BIG_ENDIAN #define LittleLong( x ) Swap32( x ) #define LittleShort( x ) Swap16( x ) #define LittleLongSW( x ) Swap32Store( x ) diff --git a/engine/client/soundlib/snd_ogg_vorbis.c b/engine/client/soundlib/snd_ogg_vorbis.c index 2c337d4c..594c1406 100644 --- a/engine/client/soundlib/snd_ogg_vorbis.c +++ b/engine/client/soundlib/snd_ogg_vorbis.c @@ -157,7 +157,7 @@ qboolean Sound_LoadOggVorbis( const char *name, const byte *buffer, fs_offset_t SetBits( sound.flags, SOUND_RESAMPLE ); Sound_ScanVorbisComments( &vorbisFile ); - while(( ret = ov_read( &vorbisFile, (char *)sound.wav + written, sound.size - written, 0, sound.width, 1, §ion )) != 0 ) + while(( ret = ov_read( &vorbisFile, (char *)sound.wav + written, sound.size - written, XASH_BIG_ENDIAN, sound.width, 1, §ion )) != 0 ) { if( ret < 0 ) { @@ -232,7 +232,7 @@ int Stream_ReadOggVorbis( stream_t *stream, int needBytes, void *buffer ) if( !stream->buffsize ) { - stream->pos = ov_read( &ctx->vf, (char *)stream->temp, OUTBUF_SIZE, 0, stream->width, 1, §ion ); + stream->pos = ov_read( &ctx->vf, (char *)stream->temp, OUTBUF_SIZE, XASH_BIG_ENDIAN, stream->width, 1, §ion ); if( stream->pos == 0 ) { break; // end of file diff --git a/public/swaplib.h b/public/swaplib.h index b83123fc..c06df5f9 100644 --- a/public/swaplib.h +++ b/public/swaplib.h @@ -111,7 +111,7 @@ static inline void swap_array_( byte *data, int32_t elem_size, uint32_t count ) // this is done in macros so we can completely avoid defining this // in little endian targets -#ifdef XASH_LITTLE_ENDIAN +#if XASH_LITTLE_ENDIAN #define be_struct_begin( x ) swap_struct_begin( x ) #define be_struct_field( x, y ) swap_struct_field( x, y ) #define be_struct_child( x, y, z ) swap_struct_child( x, y, z )