# HG changeset patch
# User Wuzzy <almikes@aol.com>
# Date 1506773759 -7200
# Node ID 806b6088863a1d965d2bdd7cbec573f285e57f01
# Parent  34685d3326a76013adb79af1ad4205d54e55d924# Parent  2ffdee246adcc43934f39bc7265dba6eaee08b4d
Merge sheepluva's changes

diff -r 34685d3326a7 -r 806b6088863a hedgewars/SDLh.pas
--- a/hedgewars/SDLh.pas	Sat Sep 30 14:15:18 2017 +0200
+++ b/hedgewars/SDLh.pas	Sat Sep 30 14:15:59 2017 +0200
@@ -100,7 +100,8 @@
     AUDIO_S16SYS         = {$IFDEF ENDIAN_LITTLE}AUDIO_S16LSB{$ELSE}AUDIO_S16MSB{$ENDIF};
 
     // default audio format from SDL_mixer.h
-    MIX_DEFAULT_FORMAT   = AUDIO_S16SYS;
+    //MIX_DEFAULT_FORMAT   = AUDIO_S16SYS;
+    MIX_DEFAULT_FORMAT   = {$IFDEF ENDIAN_LITTLE}AUDIO_S16LSB{$ELSE}AUDIO_S16MSB{$ENDIF};
 
     SDL_BUTTON_LEFT      = 1;
     SDL_BUTTON_MIDDLE    = 2;
diff -r 34685d3326a7 -r 806b6088863a hedgewars/uSound.pas
--- a/hedgewars/uSound.pas	Sat Sep 30 14:15:18 2017 +0200
+++ b/hedgewars/uSound.pas	Sat Sep 30 14:15:59 2017 +0200
@@ -324,10 +324,14 @@
     if not (isSoundEnabled or isMusicEnabled) then
         exit;
     WriteToConsole('Init sound...');
-    success:= SDL_InitSubSystem(SDL_INIT_AUDIO) >= 0;
+    success:= SDL_InitSubSystem(SDL_INIT_AUDIO) = 0;
 
     if success then
+        begin
+        WriteLnToConsole(msgOK);
+        WriteToConsole('Open audio...');
         success:= Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, channels, 1024) = 0;
+        end;
 
     if success then
         WriteLnToConsole(msgOK)