diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index f91bc624495dbbf29073904eb7ede60a3be7d8b7..388b4524d97d6108a536d865614ce2e383b70614 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
uses
utils; // for SSArray
+ const
+ ACTION_JUMP = 0;
+ ACTION_MOVELEFT = 1;
+ ACTION_MOVERIGHT = 2;
+ ACTION_LOOKDOWN = 3;
+ ACTION_LOOKUP = 4;
+ ACTION_ATTACK = 5;
+ ACTION_SCORES = 6;
+ ACTION_ACTIVATE = 7;
+ ACTION_STRAFE = 8;
+ ACTION_WEAPNEXT = 9;
+ ACTION_WEAPPREV = 10;
+
+ FIRST_ACTION = ACTION_JUMP;
+ LAST_ACTION = ACTION_WEAPPREV;
+
procedure g_Console_Init ();
procedure g_Console_Update ();
procedure g_Console_Draw ();
procedure g_Console_Add (L: AnsiString; show: Boolean=false);
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; cmd: AnsiString): Integer;
+procedure g_Console_BindKey (key: Integer; cmd: 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);
gChatShow: Boolean = false;
gChatTeam: Boolean = false;
gAllowConsoleMessages: Boolean = true;
- gChatEnter: Boolean = true;
gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
-
+ gPlayerAction, gDefaultAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
implementation
ptr: Pointer; // various data
msg: AnsiString; // message for var changes
cheat: Boolean;
+ action: Integer; // >= 0 for action commands
+ player: Integer; // used for action commands
end;
TAlias = record
Time: Word;
end;
+ bindDown, bindProcess: Boolean;
+ gInputBinds: Array [0..e_MaxInputKeys - 1] of record
+ commands: SSArray;
+ end;
+
// poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
function conParseFloat (var res: Single; const s: AnsiString): Boolean;
cp.ptr := pvar;
cp.msg := amsg;
cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
end;
cp.ptr := pvar;
cp.msg := amsg;
cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
end;
cp.ptr := pv;
cp.msg := amsg;
cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
end;
var
cmd, s: AnsiString;
a, b: Integer;
- F: TextFile;
+ (* F: TextFile; *)
begin
cmd := LowerCase(p[0]);
s := '';
if cmd = 'exec' then
begin
// exec <filename>
- if Length(p) > 1 then
- begin
- s := GameDir+'/'+p[1];
-
- {$I-}
- AssignFile(F, s);
- Reset(F);
- if IOResult <> 0 then
- begin
- g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
- CloseFile(F);
- Exit;
- end;
- g_Console_Add(Format(_lc[I_CONSOLE_EXEC], [s]));
-
- while not EOF(F) do
- begin
- ReadLn(F, s);
- if IOResult <> 0 then
- begin
- g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
- CloseFile(F);
- Exit;
- end;
- if Pos('#', s) <> 1 then // script comment
- begin
- // prevents endless loops
- Inc(RecursionDepth);
- RecursionLimitHit := (RecursionDepth > MaxScriptRecursion) or RecursionLimitHit;
- if not RecursionLimitHit then
- g_Console_Process(s, True);
- Dec(RecursionDepth);
- end;
- end;
- if (RecursionDepth = 0) and RecursionLimitHit then
- begin
- g_Console_Add(Format(_lc[I_CONSOLE_ERROR_CALL], [s]));
- RecursionLimitHit := False;
- end;
-
- CloseFile(F);
- {$I+}
- end
+ if Length(p) = 2 then
+ 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);
Whitelist[a] := LowerCase(cmd);
end;
+procedure segfault (p: SSArray);
+var
+ pp: PByte = nil;
+begin
+ pp^ := 0;
+end;
+
+procedure BindCommands (p: SSArray);
+ var cmd, key, act: AnsiString; i, j: Integer;
+begin
+ cmd := LowerCase(p[0]);
+ case cmd of
+ 'bind':
+ // bind <key> <action>
+ if Length(p) = 3 then
+ begin
+ key := LowerCase(p[1]);
+ i := 0;
+ while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
+ if i < e_MaxInputKeys then
+ g_Console_BindKey(i, p[2])
+ end;
+ 'bindlist':
+ for i := 0 to e_MaxInputKeys - 1 do
+ begin
+ if gInputBinds[i].commands <> 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 + '"')
+ end
+ end;
+ 'unbind':
+ // unbind <key>
+ if Length(p) = 2 then
+ begin
+ key := LowerCase(p[1]);
+ i := 0;
+ while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
+ if i < e_MaxInputKeys then
+ g_Console_BindKey(i, '')
+ end;
+ '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]));
+ end
+end;
+
procedure AddCommand(cmd: AnsiString; proc: TCmdProc; ahelp: AnsiString=''; ahidden: Boolean=false; acheat: Boolean=false);
var
a: Integer;
cp.ptr := nil;
cp.msg := '';
cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
end;
+procedure AddAction (cmd: AnsiString; action: Integer; help: AnsiString = ''; hidden: Boolean = False; cheat: Boolean = False);
+ const
+ PrefixList: array [0..1] of AnsiString = ('+', '-');
+ PlayerList: array [0..1] of Integer = (1, 2);
+ var
+ s: AnsiString;
+ i: Integer;
+
+ procedure NewAction (cmd: AnsiString; player: Integer);
+ var cp: PCommand;
+ begin
+ SetLength(commands, Length(commands) + 1);
+ cp := @commands[High(commands)];
+ cp.cmd := LowerCase(cmd);
+ cp.proc := nil;
+ cp.procEx := nil;
+ cp.help := help;
+ cp.hidden := hidden;
+ cp.ptr := nil;
+ cp.msg := '';
+ cp.cheat := cheat;
+ cp.action := action;
+ cp.player := player;
+ end;
-procedure segfault (p: SSArray);
-var
- pp: PByte = nil;
begin
- pp^ := 0;
+ ASSERT(action >= FIRST_ACTION);
+ ASSERT(action <= LAST_ACTION);
+ for s in PrefixList do
+ begin
+ NewAction(s + cmd, 0);
+ for i in PlayerList do
+ NewAction(s + 'p' + IntToStr(i) + '_' + cmd, i - 1)
+ end
end;
-
procedure g_Console_Init();
-var
- a: Integer;
+ var
+ a: Integer;
begin
g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
Cons_Y := -(gScreenHeight div 2);
AddCommand('segfault', segfault, 'make segfault');
+ AddCommand('bind', BindCommands);
+ AddCommand('bindlist', BindCommands);
+ AddCommand('unbind', BindCommands);
+ AddCommand('unbindall', BindCommands);
+ AddCommand('bindkeys', BindCommands);
+
AddCommand('clear', ConsoleCommands, 'clear console');
AddCommand('clearhistory', ConsoleCommands);
AddCommand('showhistory', 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('vote', GameCommands);
AddCommand('clientlist', GameCommands);
AddCommand('event', GameCommands);
+ AddCommand('screenshot', GameCommands);
+ AddCommand('togglechat', GameCommands);
+ AddCommand('toggleteamchat', GameCommands);
+ AddCommand('weapon', GameCommands);
+ AddCommand('p1_weapon', GameCommands);
+ AddCommand('p2_weapon', GameCommands);
AddCommand('god', GameCheats);
AddCommand('notarget', GameCheats);
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');
+
g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
g_Console_Add('');
end;
procedure g_Console_Switch();
begin
- if gChatShow then Exit;
+ gChatShow := False;
gConsoleShow := not gConsoleShow;
Cons_Shown := True;
g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
procedure g_Console_Chat_Switch(Team: Boolean = False);
begin
- if gConsoleShow then Exit;
if not g_Game_IsNet then Exit;
+ gConsoleShow := False;
gChatShow := not gChatShow;
gChatTeam := Team;
- if gChatShow then
- gChatEnter := False;
Line := '';
CPos := 1;
g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
procedure g_Console_Char(C: AnsiChar);
begin
- if gChatShow and (not gChatEnter) then
- Exit;
+// if gChatShow then
+// Exit;
Insert(C, Line, CPos);
CPos := CPos + 1;
end;
begin
if (Length(Line) = 0) then
begin
- if (g_Game_IsNet and g_Game_IsServer) or (g_Game_IsClient) then exit;
g_Console_Add('');
for i := 0 to High(commands) do
begin
begin
if commands[i].cmd = LowerCase(Arr[0]) then
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 *)
+ exit
+ end;
+
if assigned(commands[i].procEx) then
begin
commands[i].procEx(@commands[i], Arr);
- exit;
+ exit
end;
if assigned(commands[i].proc) then
begin
commands[i].proc(Arr);
- exit;
- end;
- end;
+ exit
+ end
+ end
end;
g_Console_Add(Format(_lc[I_CONSOLE_UNKNOWN], [Arr[0]]));
end;
+function g_Console_Interactive: Boolean;
+begin
+ Result := not bindProcess
+end;
+
+procedure g_Console_BindKey (key: Integer; cmd: 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
+ gInputBinds[key].commands := ParseAlias(cmd)
+end;
+
+function g_Console_FindBind (n: Integer; cmd: AnsiString): Integer;
+ var i: Integer;
+begin
+ ASSERT(n >= 1);
+ result := 0;
+ if commands = nil then Exit;
+ i := 0;
+ cmd := LowerCase(cmd);
+ while (n >= 1) and (i < e_MaxInputKeys) do
+ begin
+ if (Length(gInputBinds[i].commands) = 1) and (gInputBinds[i].commands[0] = cmd) then
+ begin
+ result := i;
+ dec(n)
+ 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 >= FIRST_ACTION);
+ ASSERT(action <= LAST_ACTION);
+ i := 0;
+ len := Length(gPlayerAction);
+ while (i < len) and (not gPlayerAction[i, action]) do inc(i);
+ Result := i < len
+end;
+
+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
+ begin
+ bindDown := down;
+ bindProcess := True;
+ for i := 0 to High(gInputBinds[key].commands) do
+ g_Console_Process(gInputBinds[key].commands[i], True);
+ bindProcess := False;
+ 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');
+ g_Console_BindKey(IK_D, '+p1_moveright');
+ g_Console_BindKey(IK_W, '+p1_lookup');
+ g_Console_BindKey(IK_S, '+p1_lookdown');
+ g_Console_BindKey(IK_SPACE, '+p1_jump');
+ g_Console_BindKey(IK_H, '+p1_attack');
+ g_Console_BindKey(IK_J, '+p1_activate');
+ g_Console_BindKey(IK_E, '+p1_weapnext');
+ g_Console_BindKey(IK_Q, '+p1_weapprev');
+ g_Console_BindKey(IK_ALT, '+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');
+ 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');
+ g_Console_BindKey(e_JoyAxisToKey(i, 0, 1), '+p' + IntToStr(i mod 2 + 1) + '_moveright');
+ g_Console_BindKey(e_JoyAxisToKey(i, 1, 0), '+p' + IntToStr(i mod 2 + 1) + '_lookup');
+ g_Console_BindKey(e_JoyAxisToKey(i, 1, 1), '+p' + IntToStr(i mod 2 + 1) + '_lookdown');
+ g_Console_BindKey(e_JoyButtonToKey(i, 2), '+p' + IntToStr(i mod 2 + 1) + '_jump');
+ g_Console_BindKey(e_JoyButtonToKey(i, 0), '+p' + IntToStr(i mod 2 + 1) + '_attack');
+ g_Console_BindKey(e_JoyButtonToKey(i, 3), '+p' + IntToStr(i mod 2 + 1) + '_activate');
+ g_Console_BindKey(e_JoyButtonToKey(i, 1), '+p' + IntToStr(i mod 2 + 1) + '_weapnext');
+ g_Console_BindKey(e_JoyButtonToKey(i, 4), '+p' + IntToStr(i mod 2 + 1) + '_weapprev');
+ g_Console_BindKey(e_JoyButtonToKey(i, 7), '+p' + IntToStr(i mod 2 + 1) + '_strafe');
+ end;
+
+ g_Console_BindKey(VK_LEFT, '+moveleft');
+ g_Console_BindKey(VK_RIGHT, '+moveright');
+ g_Console_BindKey(VK_UP, '+lookup');
+ g_Console_BindKey(VK_DOWN, '+lookdown');
+ g_Console_BindKey(VK_JUMP, '+jump');
+ g_Console_BindKey(VK_FIRE, '+attack');
+ g_Console_BindKey(VK_OPEN, '+activate');
+ g_Console_BindKey(VK_NEXT, '+weapnext');
+ g_Console_BindKey(VK_PREV, '+weapprev');
+ g_Console_BindKey(VK_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');
+
+ // VK_CONSOLE
+ // VK_ESCAPE
+end;
+
+procedure g_Console_ReadConfig (filename: String);
+ var f: TextFile; s: AnsiString; i, len: Integer;
+begin
+ if FileExists(filename) then
+ begin
+ AssignFile(f, filename);
+ Reset(f);
+ while not EOF(f) do
+ begin
+ ReadLn(f, s);
+ len := Length(s);
+ if len > 0 then
+ begin
+ i := 1;
+ (* skip spaces *)
+ while (i <= len) and (s[i] <= ' ') do inc(i);
+ (* skip comments *)
+ if (i <= len) and ((s[i] <> '#') and ((i + 1 > len) or (s[i] <> '/') or (s[i + 1] <> '/'))) then
+ g_Console_Process(s, True)
+ end
+ end;
+ CloseFile(f)
+ end
+end;
+
+procedure g_Console_WriteConfig (filename: String);
+ var f: TextFile; i, j: Integer; act: AnsiString;
+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].commands) > 0 then
+ begin
+ act := gInputBinds[i].commands[0];
+ for j := 1 to High(gInputBinds[i].commands) do
+ act := act + '; ' + gInputBinds[i].commands[j];
+ WriteLn(f, 'bind "', LowerCase(e_KeyNames[i]), '" "', act, '"')
+ 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.