turned on "SCOPEDENUMS" fpc option

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

diff --git a/src/engine/e_input.pas b/src/engine/e_input.pas
index deded67e211fbcfeeaf961aad76d4160ce3a928e..5cf17a788264ffc00dde1b8f1e524135680878a0 100644 (file)
--- a/src/engine/e_input.pas
+++ b/src/engine/e_input.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE e_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit e_input;
 
 interface
@@ -105,6 +105,9 @@ function  e_JoyAxisToKey(id: Word; ax: Byte; dir: Byte): Word;
 function  e_JoyHatToKey(id: Word; hat: Byte; dir: Byte): Word;
 procedure e_SetKeyState(key: Word; state: Integer);
 
+procedure e_UnpressAllKeys ();
+procedure e_KeyUpDown (key: Word; down: Boolean);
+
 var
   {e_MouseInfo:          TMouseInfo;}
   e_EnableInput:        Boolean = False;
@@ -158,7 +161,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
@@ -170,7 +173,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;
@@ -188,20 +191,39 @@ begin
   SetLength(Joysticks, 0);
 end;
 
+
+procedure e_UnpressAllKeys ();
+var
+  i: Integer;
+begin
+  for i := 0 to High(KeyBuffer) do KeyBuffer[i] := False;
+end;
+
+
+procedure e_KeyUpDown (key: Word; down: Boolean);
+begin
+  if (key > 0) and (key < Length(KeyBuffer)) then KeyBuffer[key] := down;
+end;
+
+
 function PollKeyboard(): Boolean;
+{
 var
   Keys: PByte;
   NKeys: Integer;
   i: NativeUInt;
+}
 begin
   Result := False;
+  {
   Keys := SDL_GetKeyboardState(@NKeys);
-  if (Keys = nil) or (NKeys < 1) then
-    Exit;
+  if (Keys = nil) or (NKeys < 1) then Exit;
   for i := 0 to NKeys do
-    KeyBuffer[i] := ((PByte(NativeUInt(Keys) + i)^) <> 0);
-  for i := NKeys to High(KeyBuffer) do
-    KeyBuffer[i] := False;
+  begin
+    if ((PByte(NativeUInt(Keys) + i)^) <> 0) then KeyBuffer[i] := false;
+  end;
+  for i := NKeys to High(KeyBuffer) do KeyBuffer[i] := False;
+  }
 end;
 
 function PollJoysticks(): Boolean;