fmod -> sdl2 mixer, first part: we have sounds now, but no music and no advanced...

[d2df-sdl.git] / src / game / g_main.pas

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 8c43ef8472b6b45efc755df3ca17fd3a42408def..102a05e7d216de3c7a07349d8bb1362b37e92e94 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -82,8 +82,8 @@ begin
 
   if not gNoSound then
   begin
-    e_WriteLog('Init FMOD', MSG_NOTIFY);
-    if not e_InitSoundSystem(44100, False) then e_InitSoundSystem(48000, True);
+    e_WriteLog('Initializing SDL2 mixer', MSG_NOTIFY);
+    e_InitSoundSystem();
   end;
 
   e_WriteLog('Init game', MSG_NOTIFY);
@@ -381,7 +381,6 @@ end;
 procedure KeyPress(K: Word);
 var
   Msg: g_gui.TMessage;
-  a: Integer;
 begin
   case K of
     IK_PAUSE: // <Pause/Break>:
@@ -483,13 +482,6 @@ begin
             begin
               g_GUI_ShowWindow('MainMenu');
               g_Sound_PlayEx('MENU_OPEN');
-            end
-            else
-            begin
-              for a := 0 to 14 do
-                charbuff[a] := charbuff[a+1];
-              charbuff[15] := UpCase(Chr(K));
-              Cheat();
             end;
           end;
       end;
@@ -499,6 +491,7 @@ end;
 procedure CharPress(C: Char);
 var
   Msg: g_gui.TMessage;
+  a: Integer;
 begin
   if (not gChatShow) and ((C = '`') or (C = '~') or (C = '¸') or (C = '¨')) then
     Exit;
@@ -511,6 +504,13 @@ begin
       Msg.Msg := WM_CHAR;
       Msg.WParam := Ord(C);
       g_ActiveWindow.OnMessage(Msg);
+    end
+    else
+    begin
+      for a := 0 to 14 do
+        charbuff[a] := charbuff[a+1];
+      charbuff[15] := UpCase(C);
+      Cheat();
     end;
 end;