diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index fd8e24b3cf1bd05371a5d9a1c277fc4bdb194418..a0839f3d3d0a2dba96e743b4f0b33cc8f6bc4521 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
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
pp^ := 0;
end;
+function GetCommandString (p: SSArray): AnsiString;
+ var i: Integer;
+begin
+ result := '';
+ if Length(p) >= 1 then
+ begin
+ result := p[0];
+ for i := 1 to High(p) do
+ result := result + '; ' + p[i]
+ end
+end;
+
procedure BindCommands (p: SSArray);
- var cmd, key, act: AnsiString; i, j: Integer;
+ var cmd, key: AnsiString; i: Integer;
begin
cmd := LowerCase(p[0]);
case cmd of
'bind':
- // bind <key> <down> [up]
- if Length(p) >= 3 then
+ // bind <key> [down [up]]
+ if (Length(p) >= 2) and (Length(p) <= 4) then
begin
i := 0;
key := LowerCase(p[1]);
- if Length(p) = 4 then act := p[3] else act := '';
while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
if i < e_MaxInputKeys then
- g_Console_BindKey(i, p[2], act)
+ begin
+ if Length(p) = 2 then
+ g_Console_Add('"' + e_KeyNames[i] + '" = "' + GetCommandString(gInputBinds[i].down) + '" "' + GetCommandString(gInputBinds[i].up) + '"')
+ 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
- begin
if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then
- begin
- act := e_KeyNames[i] + ' "';
- if (gInputBinds[i].down <> nil) then
- begin
- act := act + gInputBinds[i].down[0];
- for j := 1 to High(gInputBinds[i].down) - 1 do
- act := act + '; ' + gInputBinds[i].down[j];
- end;
- act := act + '" "';
- if (gInputBinds[i].up <> nil) then
- begin
- act := act + gInputBinds[i].up[0];
- for j := 1 to High(gInputBinds[i].up) do
- act := act + '; ' + gInputBinds[i].up[j];
- end;
- act := act + '"';
- g_Console_Add(act)
- end
- end;
+ g_Console_Add(e_KeyNames[i] + ' "' + GetCommandString(gInputBinds[i].down) + '" "' + GetCommandString(gInputBinds[i].up) + '"');
'unbind':
// unbind <key>
if Length(p) = 2 then
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>');
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;
AddCommand('unbindall', BindCommands);
AddCommand('showkeyboard', BindCommands);
AddCommand('hidekeyboard', BindCommands);
+ AddCommand('togglemenu', BindCommands);
AddCommand('clear', ConsoleCommands, 'clear console');
AddCommand('clearhistory', ConsoleCommands);
IK_DELETE:
if (Length(Line) > 0) and (CPos <= Length(Line)) then
Delete(Line, CPos, 1);
- IK_LEFT, IK_KPLEFT, VK_LEFT:
+ IK_LEFT, IK_KPLEFT, VK_LEFT, JOY0_LEFT, JOY1_LEFT, JOY2_LEFT, JOY3_LEFT:
if CPos > 1 then
CPos := CPos - 1;
- IK_RIGHT, IK_KPRIGHT, VK_RIGHT:
+ IK_RIGHT, IK_KPRIGHT, VK_RIGHT, JOY0_RIGHT, JOY1_RIGHT, JOY2_RIGHT, JOY3_RIGHT:
if CPos <= Length(Line) then
CPos := CPos + 1;
- IK_RETURN, IK_KPRETURN, VK_OPEN, VK_FIRE:
+ IK_RETURN, IK_KPRETURN, VK_OPEN, VK_FIRE, JOY0_ATTACK, JOY1_ATTACK, JOY2_ATTACK, JOY3_ATTACK:
begin
if Cons_Shown then
g_Console_Process(Line)
IK_TAB:
if not gChatShow then
Complete();
- IK_DOWN, IK_KPDOWN, VK_DOWN:
+ IK_DOWN, IK_KPDOWN, VK_DOWN, JOY0_DOWN, JOY1_DOWN, JOY2_DOWN, JOY3_DOWN:
if not gChatShow then
if (CommandHistory <> nil) and
(CmdIndex < Length(CommandHistory)) then
Line := CommandHistory[CmdIndex];
CPos := Length(Line) + 1;
end;
- IK_UP, IK_KPUP, VK_UP:
+ IK_UP, IK_KPUP, VK_UP, JOY0_UP, JOY1_UP, JOY2_UP, JOY3_UP:
if not gChatShow then
if (CommandHistory <> nil) and
(CmdIndex <= Length(CommandHistory)) then
Line := CommandHistory[CmdIndex];
Cpos := Length(Line) + 1;
end;
- IK_PAGEUP, IK_KPPAGEUP, VK_PREV: // PgUp
+ IK_PAGEUP, IK_KPPAGEUP, VK_PREV, JOY0_PREV, JOY1_PREV, JOY2_PREV, JOY3_PREV: // PgUp
if not gChatShow then Inc(conSkipLines);
- IK_PAGEDN, IK_KPPAGEDN, VK_NEXT: // PgDown
+ IK_PAGEDN, IK_KPPAGEDN, VK_NEXT, JOY0_NEXT, JOY1_NEXT, JOY2_NEXT, JOY3_NEXT: // PgDown
if not gChatShow and (conSkipLines > 0) then Dec(conSkipLines);
IK_HOME, IK_KPHOME:
CPos := 1;
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;
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');
(* for i := 0 to e_MaxJoys - 1 do *)
for i := 0 to 1 do
begin
- g_Console_BindKey(e_JoyAxisToKey(i, 0, 0), '+p' + IntToStr(i mod 2 + 1) + '_moveleft', '-p' + IntToStr(i mod 2 + 1) + '_moveleft');
- g_Console_BindKey(e_JoyAxisToKey(i, 0, 1), '+p' + IntToStr(i mod 2 + 1) + '_moveright', '-p' + IntToStr(i mod 2 + 1) + '_moveright');
- g_Console_BindKey(e_JoyAxisToKey(i, 1, 0), '+p' + IntToStr(i mod 2 + 1) + '_lookup', '-p' + IntToStr(i mod 2 + 1) + '_lookup');
- g_Console_BindKey(e_JoyAxisToKey(i, 1, 1), '+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');
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);
WriteLn(f, '// generated by doom2d, do not modify');
WriteLn(f, 'unbindall');
for i := 0 to e_MaxInputKeys - 1 do
- begin
if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then
- begin
- Write(f, 'bind ', e_KeyNames[i], ' "');
- if Length(gInputBinds[i].down) > 0 then
- begin
- Write(f, gInputBinds[i].down[0]);
- for j := 1 to High(gInputBinds[i].down) do
- Write(f, '; ', gInputBinds[i].down[j])
- end;
- Write(f, '"');
- if Length(gInputBinds[i].up) > 0 then
- begin
- Write(f, ' "', gInputBinds[i].up[0]);
- for j := 1 to High(gInputBinds[i].up) do
- Write(f, '; ', gInputBinds[i].up[j]);
- Write(f, '"')
- end;
- WriteLn(f)
- end
- end;
+ WriteLn(f, 'bind ', e_KeyNames[i], ' "', GetCommandString(gInputBinds[i].down), '" "', GetCommandString(gInputBinds[i].up), '"');
for i := 0 to High(commands) do
begin
if not commands[i].cheat then