fixed keyboard polling (no more); ESC should work in several places where it should...

[d2df-sdl.git] / src / engine / e_input.pas

diff --git a/src/engine/e_input.pas b/src/engine/e_input.pas
index 072dccb44cd6d592f369191e12a8b5988c6b14e9..7783734b7df3fac31c364efff201f31bdcdd6a04 100644 (file)
--- a/src/engine/e_input.pas
+++ b/src/engine/e_input.pas
@@ -94,7 +94,8 @@ const
 function  e_InitInput(): Boolean;
 procedure e_ReleaseInput();
 procedure e_ClearInputBuffer();
-function  e_PollInput(): Boolean;
+//function  e_PollInput(): Boolean;
+procedure e_PollJoysticks(); // call this from message loop to update joysticks
 function  e_KeyPressed(Key: Word): Boolean;
 function  e_AnyKeyPressed(): Boolean;
 function  e_GetFirstKeyPressed(): Word;
@@ -161,7 +162,7 @@ begin
     begin
       Inc(c);
       e_WriteLog('Input: Opened SDL joystick ' + IntToStr(i) + ' (' + SDL_JoystickName(joy) +
-                 ') as joystick ' + IntToStr(c) + ':', MSG_NOTIFY);
+                 ') as joystick ' + IntToStr(c) + ':', TMsgType.Notify);
       SetLength(Joysticks, c);
       with Joysticks[c-1] do
       begin
@@ -173,7 +174,7 @@ begin
         // TODO: find proper solution for this xbox trigger shit
         for j := 0 to Axes do AxisZero[j] := SDL_JoystickGetAxis(joy, j);
         e_WriteLog('       ' + IntToStr(Axes) + ' axes, ' + IntToStr(Buttons) + ' buttons, ' +
-                   IntToStr(Hats) + ' hats.', MSG_NOTIFY);
+                   IntToStr(Hats) + ' hats.', TMsgType.Notify);
       end;
     end;
   end;
@@ -226,21 +227,20 @@ begin
   }
 end;
 
-function PollJoysticks(): Boolean;
+procedure e_PollJoysticks();
 var
   i, j: Word;
   hat: Byte;
 begin
-  Result := False;
+  //Result := False;
   if (Joysticks = nil) or (e_JoysticksAvailable = 0) then Exit;
   SDL_JoystickUpdate();
   for j := Low(Joysticks) to High(Joysticks) do
+  begin
     with Joysticks[j] do
     begin
-      for i := 0 to Buttons do
-        ButtBuf[i] := SDL_JoystickGetButton(Handle, i) <> 0;
-      for i := 0 to Axes do
-        AxisBuf[i] := SDL_JoystickGetAxis(Handle, i);
+      for i := 0 to Buttons do ButtBuf[i] := SDL_JoystickGetButton(Handle, i) <> 0;
+      for i := 0 to Axes do AxisBuf[i] := SDL_JoystickGetAxis(Handle, i);
       for i := 0 to Hats do
       begin
         hat := SDL_JoystickGetHat(Handle, i);
@@ -250,6 +250,7 @@ begin
         HatBuf[i, HAT_RIGHT] := LongBool(hat and SDL_HAT_RIGHT);
       end;
     end;
+  end;
 end;
 
 procedure GenerateKeyNames();
@@ -322,15 +323,17 @@ begin
   end;
 end;
 
+{
 function e_PollInput(): Boolean;
 var
   kb, js: Boolean;
 begin
   kb := PollKeyboard();
-  js := PollJoysticks();
+  js := e_PollJoysticks();
 
   Result := kb or js;
 end;
+}
 
 function e_KeyPressed(Key: Word): Boolean;
 var