5 files changed, 14 insertions, 5 deletions
diff --git a/src/client/cl_cgame.c b/src/client/cl_cgame.c
index 96a18f6e..7d4c0a95 100644
--- a/src/client/cl_cgame.c
+++ b/src/client/cl_cgame.c
@@ -414,7 +414,7 @@ CL_CgameSystemCalls
 The cgame module is making a system call
 ====================
 */
-long CL_CgameSystemCalls( long *args ) {
+intptr_t CL_CgameSystemCalls( intptr_t *args ) {
 	switch( args[0] ) {
 	case CG_PRINT:
 		Com_Printf( "%s", VMA(1) );
diff --git a/src/client/cl_scrn.c b/src/client/cl_scrn.c
index d1da0018..21f4b932 100644
--- a/src/client/cl_scrn.c
+++ b/src/client/cl_scrn.c
@@ -418,7 +418,7 @@ void SCR_DrawScreenField( stereoFrame_t stereoFrame ) {
 
 	// wide aspect ratio screens need to have the sides cleared
 	// unless they are displaying game renderings
-	if ( cls.state != CA_ACTIVE ) {
+	if ( cls.state != CA_ACTIVE && cls.state != CA_CINEMATIC ) {
 		if ( cls.glconfig.vidWidth * 480 > cls.glconfig.vidHeight * 640 ) {
 			re.SetColor( g_color_table[0] );
 			re.DrawStretchPic( 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, 0, 0, 0, cls.whiteShader );
diff --git a/src/client/cl_ui.c b/src/client/cl_ui.c
index eee0ba1f..d5dca4c2 100644
--- a/src/client/cl_ui.c
+++ b/src/client/cl_ui.c
@@ -670,7 +670,7 @@ CL_UISystemCalls
 The ui module is making a system call
 ====================
 */
-long CL_UISystemCalls( long *args ) {
+intptr_t CL_UISystemCalls( intptr_t *args ) {
 	switch( args[0] ) {
 	case UI_ERROR:
 		Com_Error( ERR_DROP, "%s", VMA(1) );
diff --git a/src/client/snd_codec_wav.c b/src/client/snd_codec_wav.c
index 281a0023..e38b360e 100644
--- a/src/client/snd_codec_wav.c
+++ b/src/client/snd_codec_wav.c
@@ -133,6 +133,7 @@ static qboolean S_ReadRIFFHeader(fileHandle_t file, snd_info_t *info)
 {
 	char dump[16];
 	int wav_format;
+	int bits;
 	int fmtlen = 0;
 
 	// skip the riff wav header
@@ -151,7 +152,15 @@ static qboolean S_ReadRIFFHeader(fileHandle_t file, snd_info_t *info)
 	info->rate = FGetLittleLong(file);
 	FGetLittleLong(file);
 	FGetLittleShort(file);
-	info->width = FGetLittleShort(file) / 8;
+	bits = FGetLittleShort(file);
+
+	if( bits < 8 )
+	{
+	  Com_Printf( S_COLOR_RED "ERROR: Less than 8 bit sound is not supported\n");
+	  return qfalse;
+	}
+
+	info->width = bits / 8;
 	info->dataofs = 0;
 
 	// Skip the rest of the format chunk if required
diff --git a/src/client/snd_openal.c b/src/client/snd_openal.c
index e3a01754..699db246 100644
--- a/src/client/snd_openal.c
+++ b/src/client/snd_openal.c
@@ -1641,7 +1641,7 @@ qboolean S_AL_Init( soundInterface_t *si )
 	s_alMinDistance = Cvar_Get( "s_alMinDistance", "120", CVAR_CHEAT );
 	s_alRolloff = Cvar_Get( "s_alRolloff", "0.8", CVAR_CHEAT );
 	s_alMaxSpeakerDistance = Cvar_Get( "s_alMaxSpeakerDistance", "1024", CVAR_ARCHIVE );
-	s_alSpatEntOrigin = Cvar_Get( "s_alSpatEntOrigin", "1", CVAR_ARCHIVE );
+	s_alSpatEntOrigin = Cvar_Get( "s_alSpatEntOrigin", "0", CVAR_ARCHIVE );
 
 	s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE );