X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fgame%2Fg_console.pas;h=a0839f3d3d0a2dba96e743b4f0b33cc8f6bc4521;hb=4de34c0c003869d8f125768be330702020f3c514;hp=59174bf3b66b96ae71fbc637e92b984657e93662;hpb=7e9bc1301ecf92dd4c78bb613828839fbd9b0393;p=d2df-sdl.git

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 59174bf..a0839f3 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -145,6 +145,7 @@ var
   gInputBinds: Array [0..e_MaxInputKeys - 1] of record
     down, up: SSArray;
   end;
+  menu_toggled: BOOLEAN;
 
 
 // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
@@ -636,7 +637,7 @@ begin
   case cmd of
   'bind':
     // bind <key> [down [up]]
-    if Length(p) >= 2 then
+    if (Length(p) >= 2) and (Length(p) <= 4) then
     begin
       i := 0;
       key := LowerCase(p[1]);
@@ -645,14 +646,18 @@ begin
       begin
         if Length(p) = 2 then
           g_Console_Add('"' + e_KeyNames[i] + '" = "' + GetCommandString(gInputBinds[i].down) + '" "' + GetCommandString(gInputBinds[i].up) + '"')
-        else if Length(p) >= 4 then
-          g_Console_BindKey(i, p[2], p[3])
-        else
+        else if Length(p) = 3 then
           g_Console_BindKey(i, p[2], '')
+        else (* len = 4 *)
+          g_Console_BindKey(i, p[2], p[3])
       end
+      else
+        g_Console_Add('bind: "' + p[1] + '" is not a key')
     end
     else
-      g_Console_Add('bind <key> <down action> [up action]');
+    begin
+      g_Console_Add('bind <key> <down action> [up action]')
+    end;
   'bindlist':
     for i := 0 to e_MaxInputKeys - 1 do
       if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then
@@ -666,6 +671,8 @@ begin
       while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
       if i < e_MaxInputKeys then
         g_Console_BindKey(i, '')
+      else
+        g_Console_Add('unbind: "' + p[1] + '" is not a key')
     end
     else
       g_Console_Add('unbind <key>');
@@ -673,9 +680,15 @@ begin
     for i := 0 to e_MaxInputKeys - 1 do
       g_Console_BindKey(i, '');
   'showkeyboard':
-     g_Touch_ShowKeyboard(True);
+    g_Touch_ShowKeyboard(True);
   'hidekeyboard':
-     g_Touch_ShowKeyboard(False);
+    g_Touch_ShowKeyboard(False);
+  'togglemenu':
+    begin
+      // this is HACK
+      KeyPress(VK_ESCAPE);
+      menu_toggled := True
+    end;
   end
 end;
 
@@ -761,6 +774,7 @@ begin
   AddCommand('unbindall', BindCommands);
   AddCommand('showkeyboard', BindCommands);
   AddCommand('hidekeyboard', BindCommands);
+  AddCommand('togglemenu', BindCommands);
 
   AddCommand('clear', ConsoleCommands, 'clear console');
   AddCommand('clearhistory', ConsoleCommands);
@@ -1675,7 +1689,10 @@ begin
     else
       for i := 0 to High(gInputBinds[key].up) do
         g_Console_Process(gInputBinds[key].up[i], True)
-  end
+  end;
+  if down and not menu_toggled then
+    KeyPress(key);
+  menu_toggled := False
 end;
 
 procedure g_Console_ResetBinds;
@@ -1684,6 +1701,7 @@ begin
   for i := 0 to e_MaxInputKeys - 1 do
     g_Console_BindKey(i, '', '');
 
+  g_Console_BindKey(IK_ESCAPE, 'togglemenu');
   g_Console_BindKey(IK_A, '+p1_moveleft', '-p1_moveleft');
   g_Console_BindKey(IK_D, '+p1_moveright', '-p1_moveright');
   g_Console_BindKey(IK_W, '+p1_lookup', '-p1_lookup');
@@ -1715,18 +1733,21 @@ begin
   (* for i := 0 to e_MaxJoys - 1 do *)
   for i := 0 to 1 do
   begin
-    g_Console_BindKey(e_JoyAxisToKey(i, 0, AX_MINUS), '+p' + IntToStr(i mod 2 + 1) + '_moveleft', '-p' + IntToStr(i mod 2 + 1) + '_moveleft');
-    g_Console_BindKey(e_JoyAxisToKey(i, 0, AX_PLUS), '+p' + IntToStr(i mod 2 + 1) + '_moveright', '-p' + IntToStr(i mod 2 + 1) + '_moveright');
-    g_Console_BindKey(e_JoyAxisToKey(i, 1, AX_MINUS), '+p' + IntToStr(i mod 2 + 1) + '_lookup', '-p' + IntToStr(i mod 2 + 1) + '_lookup');
-    g_Console_BindKey(e_JoyAxisToKey(i, 1, AX_PLUS), '+p' + IntToStr(i mod 2 + 1) + '_lookdown', '-p' + IntToStr(i mod 2 + 1) + '_lookdown');
+    g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_LEFT), '+p' + IntToStr(i mod 2 + 1) + '_moveleft', '-p' + IntToStr(i mod 2 + 1) + '_moveleft');
+    g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_RIGHT), '+p' + IntToStr(i mod 2 + 1) + '_moveright', '-p' + IntToStr(i mod 2 + 1) + '_moveright');
+    g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_UP), '+p' + IntToStr(i mod 2 + 1) + '_lookup', '-p' + IntToStr(i mod 2 + 1) + '_lookup');
+    g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_DOWN), '+p' + IntToStr(i mod 2 + 1) + '_lookdown', '-p' + IntToStr(i mod 2 + 1) + '_lookdown');
     g_Console_BindKey(e_JoyButtonToKey(i, 2), '+p' + IntToStr(i mod 2 + 1) + '_jump', '-p' + IntToStr(i mod 2 + 1) + '_jump');
     g_Console_BindKey(e_JoyButtonToKey(i, 0), '+p' + IntToStr(i mod 2 + 1) + '_attack', '-p' + IntToStr(i mod 2 + 1) + '_attack');
     g_Console_BindKey(e_JoyButtonToKey(i, 3), '+p' + IntToStr(i mod 2 + 1) + '_activate', '-p' + IntToStr(i mod 2 + 1) + '_activate');
     g_Console_BindKey(e_JoyButtonToKey(i, 1), '+p' + IntToStr(i mod 2 + 1) + '_weapnext', '-p' + IntToStr(i mod 2 + 1) + '_weapnext');
     g_Console_BindKey(e_JoyButtonToKey(i, 4), '+p' + IntToStr(i mod 2 + 1) + '_weapprev', '-p' + IntToStr(i mod 2 + 1) + '_weapprev');
     g_Console_BindKey(e_JoyButtonToKey(i, 7), '+p' + IntToStr(i mod 2 + 1) + '_strafe', '-p' + IntToStr(i mod 2 + 1) + '_strafe');
+    g_Console_BindKey(e_JoyButtonToKey(i, 10), 'togglemenu');
   end;
 
+  // HACK: VK_ESCAPE always used as togglemenu, so don't touch it!
+  // VK_CONSOLE
   g_Console_BindKey(VK_LSTRAFE, '+moveleft; +strafe', '-moveleft; -strafe');
   g_Console_BindKey(VK_RSTRAFE, '+moveright; +strafe', '-moveright; -strafe');
   g_Console_BindKey(VK_LEFT, '+moveleft', '-moveleft');
@@ -1756,9 +1777,6 @@ begin
   g_Console_BindKey(VK_STATUS, '+scores', '-scores');
   g_Console_BindKey(VK_SHOWKBD, 'showkeyboard');
   g_Console_BindKey(VK_HIDEKBD, 'hidekeyboard');
-
-  // VK_CONSOLE
-  // VK_ESCAPE
 end;
 
 procedure g_Console_ReadConfig (filename: String);