diff --git a/src/engine/e_input.pas b/src/engine/e_input.pas
index 5cf17a788264ffc00dde1b8f1e524135680878a0..7783734b7df3fac31c364efff201f31bdcdd6a04 100644 (file)
--- a/src/engine/e_input.pas
+++ b/src/engine/e_input.pas
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;
}
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);
HatBuf[i, HAT_RIGHT] := LongBool(hat and SDL_HAT_RIGHT);
end;
end;
+ end;
end;
procedure GenerateKeyNames();
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