diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 21b056f66130f629832193af63b51ed096abd1e5..fd8e24b3cf1bd05371a5d9a1c277fc4bdb194418 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
procedure g_Console_Clear ();
function g_Console_CommandBlacklisted (C: AnsiString): Boolean;
procedure g_Console_ReadConfig (filename: String);
+procedure g_Console_WriteConfig (filename: String);
function g_Console_Interactive: Boolean;
function g_Console_Action (action: Integer): Boolean;
+function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer;
+procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = '');
procedure g_Console_ProcessBind (key: Integer; down: Boolean);
+procedure g_Console_ResetBinds;
procedure conwriteln (const s: AnsiString; show: Boolean=false);
procedure conwritefln (const s: AnsiString; args: array of const; show: Boolean=false);
gChatTeam: Boolean = false;
gAllowConsoleMessages: Boolean = true;
gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
- gPlayerAction, gDefaultAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
+ gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
implementation
Time: Word;
end;
- bindDown, bindProcess: Boolean;
gInputBinds: Array [0..e_MaxInputKeys - 1] of record
- commands: SSArray;
+ down, up: SSArray;
end;
begin
// exec <filename>
if Length(p) = 2 then
- begin
- s := GameDir + '/' + p[1];
- g_Console_ReadConfig(s);
- end
+ g_Console_ReadConfig(GameDir + '/' + p[1])
else
g_Console_Add('exec <script file>');
end;
+ if cmd = 'writeconfig' then
+ begin
+ // writeconfig <filename>
+ if Length(p) = 2 then
+ g_Console_WriteConfig(GameDir + '/' + p[1])
+ else
+ g_Console_Add('writeconfig <file>');
+ end;
+
if (cmd = 'ver') or (cmd = 'version') then
begin
conwriteln('Doom 2D: Forever v. ' + GAME_VERSION);
else
g_Console_Add('call <alias name>');
end;
-
- if cmd = '//' then
- Exit;
end;
procedure WhitelistCommand(cmd: AnsiString);
cmd := LowerCase(p[0]);
case cmd of
'bind':
- // bind <key> <action>
- if Length(p) = 3 then
+ // bind <key> <down> [up]
+ if Length(p) >= 3 then
begin
- key := LowerCase(p[1]);
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
- gInputBinds[i].commands := ParseAlias(p[2])
- end;
+ g_Console_BindKey(i, p[2], act)
+ end
+ else
+ g_Console_Add('bind <key> <down action> [up action]');
'bindlist':
for i := 0 to e_MaxInputKeys - 1 do
begin
- if gInputBinds[i].commands <> nil then
+ if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then
begin
- act := gInputBinds[i].commands[0];
- for j := 1 to High(gInputBinds[i].commands) do
- act := act + ' ;' + gInputBinds[i].commands[j];
- g_Console_Add(LowerCase(e_KeyNames[i]) + ' "' + act + '"')
+ 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;
'unbind':
i := 0;
while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
if i < e_MaxInputKeys then
- gInputBinds[i].commands := nil
- end;
+ g_Console_BindKey(i, '')
+ end
+ else
+ g_Console_Add('unbind <key>');
'unbindall':
for i := 0 to e_MaxInputKeys - 1 do
- if gInputBinds[i].commands <> nil then
- gInputBinds[i].commands := nil;
- 'bindkeys':
- for i := 0 to e_MaxInputKeys - 1 do
- if e_KeyNames[i] <> '' then
- g_Console_Add(LowerCase(e_KeyNames[i]));
+ g_Console_BindKey(i, '');
+ 'showkeyboard':
+ g_Touch_ShowKeyboard(True);
+ 'hidekeyboard':
+ g_Touch_ShowKeyboard(False);
end
end;
@@ -704,7 +726,7 @@ procedure AddAction (cmd: AnsiString; action: Integer; help: AnsiString = ''; hi
end;
begin
- ASSERT(action >= 0);
+ ASSERT(action >= FIRST_ACTION);
ASSERT(action <= LAST_ACTION);
for s in PrefixList do
begin
AddCommand('bindlist', BindCommands);
AddCommand('unbind', BindCommands);
AddCommand('unbindall', BindCommands);
- AddCommand('bindkeys', BindCommands);
-
- AddAction('jump', ACTION_JUMP);
- AddAction('moveleft', ACTION_MOVELEFT);
- AddAction('moveright', ACTION_MOVERIGHT);
- AddAction('lookup', ACTION_LOOKUP);
- AddAction('lookdown', ACTION_LOOKDOWN);
- AddAction('attack', ACTION_ATTACK);
- AddAction('scores', ACTION_SCORES);
- AddAction('activate', ACTION_ACTIVATE);
- AddAction('strafe', ACTION_STRAFE);
- AddAction('weapnext', ACTION_WEAPNEXT);
- AddAction('weapprev', ACTION_WEAPPREV);
+ AddCommand('showkeyboard', BindCommands);
+ AddCommand('hidekeyboard', BindCommands);
AddCommand('clear', ConsoleCommands, 'clear console');
AddCommand('clearhistory', ConsoleCommands);
AddCommand('echo', ConsoleCommands);
AddCommand('dump', ConsoleCommands);
AddCommand('exec', ConsoleCommands);
+ AddCommand('writeconfig', ConsoleCommands);
AddCommand('alias', ConsoleCommands);
AddCommand('call', ConsoleCommands);
AddCommand('ver', ConsoleCommands);
AddCommand('p2_name', GameCVars);
AddCommand('p1_color', GameCVars);
AddCommand('p2_color', GameCVars);
- AddCommand('r_showfps', GameCVars);
AddCommand('r_showtime', GameCVars);
AddCommand('r_showscore', GameCVars);
AddCommand('r_showlives', GameCVars);
AddCommand('aimline', GameCheats);
AddCommand('automap', GameCheats);
+ AddAction('jump', ACTION_JUMP);
+ AddAction('moveleft', ACTION_MOVELEFT);
+ AddAction('moveright', ACTION_MOVERIGHT);
+ AddAction('lookup', ACTION_LOOKUP);
+ AddAction('lookdown', ACTION_LOOKDOWN);
+ AddAction('attack', ACTION_ATTACK);
+ AddAction('scores', ACTION_SCORES);
+ AddAction('activate', ACTION_ACTIVATE);
+ AddAction('strafe', ACTION_STRAFE);
+ AddAction('weapnext', ACTION_WEAPNEXT);
+ AddAction('weapprev', ACTION_WEAPPREV);
+
WhitelistCommand('say');
WhitelistCommand('tell');
WhitelistCommand('overtime');
WhitelistCommand('g_scorelimit');
WhitelistCommand('g_timelimit');
+ g_Console_ResetBinds;
g_Console_ReadConfig(GameDir + '/dfconfig.cfg');
g_Console_ReadConfig(GameDir + '/autoexec.cfg');
begin
if commands[i].action >= 0 then
begin
- if bindProcess then
- begin
- if bindDown then
- gPlayerAction[commands[i].player, commands[i].action] := commands[i].cmd[1] = '+'
- else
- gPlayerAction[commands[i].player, commands[i].action] := gDefaultAction[commands[i].player, commands[i].action]
- end
- else
- begin
- gPlayerAction[commands[i].player, commands[i].action] := commands[i].cmd[1] = '+';
- gDefaultAction[commands[i].player, commands[i].action] := commands[i].cmd[1] = '+'
- end;
- exit
- end
- else if bindProcess and not bindDown then
- begin
- (* command is not action, so do not execute it again after button release *)
+ gPlayerAction[commands[i].player, commands[i].action] := commands[i].cmd[1] = '+';
exit
end;
-
if assigned(commands[i].procEx) then
begin
commands[i].procEx(@commands[i], Arr);
function g_Console_Interactive: Boolean;
begin
- Result := not bindProcess
+ Result := gConsoleShow
+end;
+
+procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = '');
+begin
+ //e_LogWritefln('bind "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), cmd, key]);
+ ASSERT(key >= 0);
+ ASSERT(key < e_MaxInputKeys);
+ if key > 0 then
+ begin
+ gInputBinds[key].down := ParseAlias(down);
+ gInputBinds[key].up := ParseAlias(up)
+ end
+end;
+
+function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer;
+ var i: Integer;
+
+ function EqualsCommandLists (a, b: SSArray): Boolean;
+ var i, len: Integer;
+ begin
+ result := False;
+ len := Length(a);
+ if len = Length(b) then
+ begin
+ i := 0;
+ while (i < len) and (a[i] = b[i]) do inc(i);
+ if i >= len then
+ result := True
+ end
+ end;
+
+begin
+ ASSERT(n >= 1);
+ result := 0;
+ if commands = nil then Exit;
+ i := 0;
+ while (n >= 1) and (i < e_MaxInputKeys) do
+ begin
+ if EqualsCommandLists(ParseAlias(down), gInputBinds[i].down) then
+ begin
+ if EqualsCommandLists(ParseAlias(up), gInputBinds[i].up) then
+ begin
+ result := i;
+ dec(n)
+ end
+ end;
+ inc(i)
+ end;
+ if n >= 1 then
+ result := 0
end;
function g_Console_Action (action: Integer): Boolean;
var i, len: Integer;
begin
- ASSERT(action >= 0);
+ ASSERT(action >= FIRST_ACTION);
ASSERT(action <= LAST_ACTION);
i := 0;
len := Length(gPlayerAction);
procedure g_Console_ProcessBind (key: Integer; down: Boolean);
var i: Integer;
begin
- if (not gChatShow) and (not gConsoleShow) and (key >= 0) and (key < e_MaxInputKeys) and (gInputBinds[key].commands <> nil) then
+ if (not gChatShow) and (not gConsoleShow) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
begin
- bindDown := down;
- bindProcess := True;
- for i := 0 to High(gInputBinds[key].commands) do
- g_Console_Process(gInputBinds[key].commands[i], True);
- bindProcess := False;
+ if down then
+ for i := 0 to High(gInputBinds[key].down) do
+ g_Console_Process(gInputBinds[key].down[i], True)
+ else
+ for i := 0 to High(gInputBinds[key].up) do
+ g_Console_Process(gInputBinds[key].up[i], True)
end
end;
+procedure g_Console_ResetBinds;
+ var i: Integer;
+begin
+ for i := 0 to e_MaxInputKeys - 1 do
+ g_Console_BindKey(i, '', '');
+
+ 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');
+ g_Console_BindKey(IK_S, '+p1_lookdown', '-p1_lookdown');
+ g_Console_BindKey(IK_SPACE, '+p1_jump', '-p1_jump');
+ g_Console_BindKey(IK_H, '+p1_attack', '-p1_attack');
+ g_Console_BindKey(IK_J, '+p1_activate', '-p1_activate');
+ g_Console_BindKey(IK_E, '+p1_weapnext', '-p1_weapnext');
+ g_Console_BindKey(IK_Q, '+p1_weapprev', '-p1_weapprev');
+ g_Console_BindKey(IK_ALT, '+p1_strafe', '-p1_strafe');
+ g_Console_BindKey(IK_1, 'p1_weapon 1');
+ g_Console_BindKey(IK_2, 'p1_weapon 2');
+ g_Console_BindKey(IK_3, 'p1_weapon 3');
+ g_Console_BindKey(IK_4, 'p1_weapon 4');
+ g_Console_BindKey(IK_5, 'p1_weapon 5');
+ g_Console_BindKey(IK_6, 'p1_weapon 6');
+ g_Console_BindKey(IK_7, 'p1_weapon 7');
+ g_Console_BindKey(IK_8, 'p1_weapon 8');
+ g_Console_BindKey(IK_9, 'p1_weapon 9');
+ g_Console_BindKey(IK_0, 'p1_weapon 10');
+ g_Console_BindKey(IK_MINUS, 'p1_weapon 11');
+ g_Console_BindKey(IK_T, 'togglechat');
+ g_Console_BindKey(IK_Y, 'toggleteamchat');
+ g_Console_BindKey(IK_F11, 'screenshot');
+ g_Console_BindKey(IK_TAB, '+p1_scores', '-p1_scores');
+ g_Console_BindKey(IK_PAUSE, 'pause');
+ g_Console_BindKey(IK_F1, 'vote');
+
+ (* 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_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');
+ end;
+
+ 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_RIGHT, '+moveright', '-moveright');
+ g_Console_BindKey(VK_UP, '+lookup', '-lookup');
+ g_Console_BindKey(VK_DOWN, '+lookdown', '-lookdown');
+ g_Console_BindKey(VK_JUMP, '+jump', '-jump');
+ g_Console_BindKey(VK_FIRE, '+attack', '-attack');
+ g_Console_BindKey(VK_OPEN, '+activate', '-activate');
+ g_Console_BindKey(VK_NEXT, '+weapnext', '-weapnext');
+ g_Console_BindKey(VK_PREV, '+weapprev', '-weapprev');
+ g_Console_BindKey(VK_STRAFE, '+strafe', '-strafe');
+ g_Console_BindKey(VK_0, 'weapon 1');
+ g_Console_BindKey(VK_1, 'weapon 2');
+ g_Console_BindKey(VK_2, 'weapon 3');
+ g_Console_BindKey(VK_3, 'weapon 4');
+ g_Console_BindKey(VK_4, 'weapon 5');
+ g_Console_BindKey(VK_5, 'weapon 6');
+ g_Console_BindKey(VK_6, 'weapon 7');
+ g_Console_BindKey(VK_7, 'weapon 8');
+ g_Console_BindKey(VK_8, 'weapon 9');
+ g_Console_BindKey(VK_9, 'weapon 10');
+ g_Console_BindKey(VK_A, 'weapon 11');
+ g_Console_BindKey(VK_CHAT, 'togglechat');
+ g_Console_BindKey(VK_TEAM, 'toggleteamchat');
+ g_Console_BindKey(VK_PRINTSCR, 'screenshot');
+ 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);
var f: TextFile; s: AnsiString; i, len: Integer;
end
end;
+procedure g_Console_WriteConfig (filename: String);
+ var f: TextFile; i, j: Integer;
+begin
+ AssignFile(f, filename);
+ Rewrite(f);
+ 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;
+ for i := 0 to High(commands) do
+ begin
+ if not commands[i].cheat then
+ begin
+ if @commands[i].procEx = @boolVarHandler then
+ begin
+ if PBoolean(commands[i].ptr)^ then j := 1 else j := 0;
+ WriteLn(f, commands[i].cmd, ' "', j, '"')
+ end
+ else if @commands[i].procEx = @intVarHandler then
+ begin
+ WriteLn(f, commands[i].cmd, ' "', PInteger(commands[i].ptr)^, '"')
+ end
+ else if @commands[i].procEx = @singleVarHandler then
+ begin
+ WriteLn(f, commands[i].cmd, ' "', PVarSingle(commands[i].ptr).val^:0:6, '"')
+ end
+ end
+ end;
+ CloseFile(f)
+end;
+
end.