diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index e0f401deeade15964e5c93c103ecebfa6065088c..fd8e24b3cf1bd05371a5d9a1c277fc4bdb194418 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
interface
uses
- wadreader; // for SArray
+ 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_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; 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);
// <0: no arg; 0/1: true/false
-function conGetBoolArg (p: SArray; idx: Integer): Integer;
+function conGetBoolArg (p: SSArray; idx: Integer): Integer;
procedure g_Console_Chat_Switch (team: Boolean=false);
-procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false); overload;
-procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PInteger; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+
+// poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
+function conParseFloat (var res: Single; const s: AnsiString): Boolean;
var
gChatShow: Boolean = false;
gChatTeam: Boolean = false;
gAllowConsoleMessages: Boolean = true;
- gChatEnter: Boolean = true;
gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
-
+ gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
implementation
uses
g_textures, g_main, e_graphics, e_input, g_game,
- SysUtils, g_basic, g_options, Math,
- g_menu, g_language, g_net, g_netmsg, e_log, conbuf, utils;
+ SysUtils, g_basic, g_options, Math, g_touch,
+ g_menu, g_language, g_net, g_netmsg, e_log, conbuf;
type
PCommand = ^TCommand;
- TCmdProc = procedure (p: SArray);
- TCmdProcEx = procedure (me: PCommand; p: SArray);
+ TCmdProc = procedure (p: SSArray);
+ TCmdProcEx = procedure (me: PCommand; p: SSArray);
TCommand = record
cmd: AnsiString;
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
name: AnsiString;
- commands: SArray;
+ commands: SSArray;
end;
Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü?
Line: AnsiString;
CPos: Word;
- //ConsoleHistory: SArray;
- CommandHistory: SArray;
- Whitelist: SArray;
+ //ConsoleHistory: SSArray;
+ CommandHistory: SSArray;
+ Whitelist: SSArray;
commands: Array of TCommand = nil;
Aliases: Array of TAlias = nil;
CmdIndex: Word;
Time: Word;
end;
+ gInputBinds: Array [0..e_MaxInputKeys - 1] of record
+ down, up: SSArray;
+ end;
+
+
+// poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
+function conParseFloat (var res: Single; const s: AnsiString): Boolean;
+var
+ pos: Integer = 1;
+ frac: Single = 1;
+ slen: Integer;
+begin
+ result := false;
+ res := 0;
+ slen := Length(s);
+ while (slen > 0) and (s[slen] <= ' ') do Dec(slen);
+ while (pos <= slen) and (s[pos] <= ' ') do Inc(pos);
+ if (pos > slen) then exit;
+ if (slen-pos = 1) and (s[pos] = '.') then exit; // single dot
+ // integral part
+ while (pos <= slen) do
+ begin
+ if (s[pos] < '0') or (s[pos] > '9') then break;
+ res := res*10+Byte(s[pos])-48;
+ Inc(pos);
+ end;
+ if (pos <= slen) then
+ begin
+ // must be a dot
+ if (s[pos] <> '.') then exit;
+ Inc(pos);
+ while (pos <= slen) do
+ begin
+ if (s[pos] < '0') or (s[pos] > '9') then break;
+ frac := frac/10;
+ res += frac*(Byte(s[pos])-48);
+ Inc(pos);
+ end;
+ end;
+ if (pos <= slen) then exit; // oops
+ result := true;
+end;
+
// ////////////////////////////////////////////////////////////////////////// //
// <0: no arg; 0/1: true/false; 666: toggle
-function conGetBoolArg (p: SArray; idx: Integer): Integer;
+function conGetBoolArg (p: SSArray; idx: Integer): Integer;
begin
if (idx < 0) or (idx > High(p)) then begin result := -1; exit; end;
result := 0;
end;
-procedure boolVarHandler (me: PCommand; p: SArray);
+procedure boolVarHandler (me: PCommand; p: SSArray);
procedure binaryFlag (var flag: Boolean; msg: AnsiString);
begin
if (Length(p) > 2) then
begin
case conGetBoolArg(p, 1) of
-1: begin end;
- 0: if conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end;
- 1: if conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end;
- 666: if conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end;
+ 0: if not me.cheat or conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end;
+ 1: if not me.cheat or conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end;
+ 666: if not me.cheat or conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end;
end;
- if flag then conwritefln('%s: tan', [msg]) else conwritefln('%s: ona', [msg]);
+ if (Length(msg) = 0) then msg := p[0] else msg += ':';
+ if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]);
end;
end;
begin
end;
-procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false); overload;
+procedure intVarHandler (me: PCommand; p: SSArray);
+ procedure binaryFlag (var flag: Boolean; msg: AnsiString);
+ begin
+ if (Length(p) > 2) then
+ begin
+ conwritefln('too many arguments to ''%s''', [p[0]]);
+ end
+ else
+ begin
+ case conGetBoolArg(p, 1) of
+ -1: begin end;
+ 0: if not me.cheat or conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end;
+ 1: if not me.cheat or conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end;
+ 666: if not me.cheat or conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end;
+ end;
+ if (Length(msg) = 0) then msg := p[0] else msg += ':';
+ if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]);
+ end;
+ end;
+begin
+ if (Length(p) <> 2) then
+ begin
+ conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]);
+ end
+ else
+ begin
+ try
+ PInteger(me.ptr)^ := StrToInt(p[1]);
+ except
+ conwritefln('invalid integer value: "%s"', [p[1]]);
+ end;
+ end;
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
var
f: Integer;
cp: PCommand;
cp.proc := nil;
cp.procEx := boolVarHandler;
cp.help := ahelp;
- cp.hidden := false;
+ cp.hidden := ahidden;
+ cp.ptr := pvar;
+ cp.msg := amsg;
+ cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PInteger; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+ f: Integer;
+ cp: PCommand;
+begin
+ f := Length(commands);
+ SetLength(commands, f+1);
+ cp := @commands[f];
+ cp.cmd := LowerCase(conname);
+ cp.proc := nil;
+ cp.procEx := intVarHandler;
+ cp.help := ahelp;
+ cp.hidden := ahidden;
cp.ptr := pvar;
cp.msg := amsg;
cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
end;
end;
-procedure singleVarHandler (me: PCommand; p: SArray);
- // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
- function parseFloat (var res: Single; const s: AnsiString): Boolean;
- var
- pos: Integer = 1;
- frac: Single = 1;
- slen: Integer;
- begin
- result := false;
- res := 0;
- slen := Length(s);
- while (slen > 0) and (s[slen] <= ' ') do Dec(slen);
- while (pos <= slen) and (s[pos] <= ' ') do Inc(pos);
- if (pos > slen) then exit;
- if (slen-pos = 1) and (s[pos] = '.') then exit; // single dot
- // integral part
- while (pos <= slen) do
- begin
- if (s[pos] < '0') or (s[pos] > '9') then break;
- res := res*10+Byte(s[pos])-48;
- Inc(pos);
- end;
- if (pos <= slen) then
- begin
- // must be a dot
- if (s[pos] <> '.') then exit;
- Inc(pos);
- while (pos <= slen) do
- begin
- if (s[pos] < '0') or (s[pos] > '9') then break;
- frac := frac/10;
- res += frac*(Byte(s[pos])-48);
- Inc(pos);
- end;
- end;
- if (pos <= slen) then exit; // oops
- result := true;
- end;
+procedure singleVarHandler (me: PCommand; p: SSArray);
var
pv: PVarSingle;
nv: Single;
begin
if (Length(p) > 2) then
begin
- conwritefln('too many arguments to ''%s''', [p[0]]);
+ conwritefln('too many arguments to ''%s''', [me.cmd]);
exit;
end;
pv := PVarSingle(me.ptr);
if (Length(p) = 2) then
begin
- if not conIsCheatsEnabled then begin conwriteln('not available'); exit; end;
+ if me.cheat and (not conIsCheatsEnabled) then begin conwriteln('not available'); exit; end;
if (CompareText(p[1], 'default') = 0) or (CompareText(p[1], 'def') = 0) or
(CompareText(p[1], 'd') = 0) or (CompareText(p[1], 'off') = 0) or
(CompareText(p[1], 'ona') = 0) then
end
else
begin
- if not parseFloat(nv, p[1]) then
+ if not conParseFloat(nv, p[1]) then
begin
- conwritefln('%s: ''%s'' doesn''t look like a floating number', [p[0], p[1]]);
+ conwritefln('%s: ''%s'' doesn''t look like a floating number', [me.cmd, p[1]]);
exit;
end;
if (nv < pv.min) then nv := pv.min;
end;
end;
msg := me.msg;
- if (Length(msg) = 0) then msg := p[0] else msg += ':';
+ if (Length(msg) = 0) then msg := me.cmd else msg += ':';
conwritefln('%s %s', [msg, pv.val^]);
end;
-procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
var
f: Integer;
cp: PCommand;
pv: PVarSingle;
begin
- GetMem(pv, sizeof(pv^));
+ GetMem(pv, sizeof(TVarSingle));
pv.val := pvar;
pv.min := amin;
pv.max := amax;
cp.proc := nil;
cp.procEx := singleVarHandler;
cp.help := ahelp;
- cp.hidden := false;
+ cp.hidden := ahidden;
cp.ptr := pv;
cp.msg := amsg;
cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
end;
end;
end;
-function ParseAlias(Str: AnsiString): SArray;
+function ParseAlias(Str: AnsiString): SSArray;
begin
Result := nil;
end;
end;
-procedure ConsoleCommands(p: SArray);
+procedure ConsoleCommands(p: SSArray);
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);
+ conwritefln('Net protocol v. %d', [NET_PROTOCOL_VER]);
+ conwritefln('Build date: %s at %s', [GAME_BUILDDATE, GAME_BUILDTIME]);
+ end;
+
if cmd = 'alias' then
begin
// alias [alias_name] [commands]
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> <down> [up]
+ if Length(p) >= 3 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)
+ end
+ else
+ g_Console_Add('bind <key> <down action> [up action]');
+ '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;
+ '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
+ else
+ g_Console_Add('unbind <key>');
+ 'unbindall':
+ for i := 0 to e_MaxInputKeys - 1 do
+ g_Console_BindKey(i, '');
+ 'showkeyboard':
+ g_Touch_ShowKeyboard(True);
+ 'hidekeyboard':
+ g_Touch_ShowKeyboard(False);
+ 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;
+
+begin
+ 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);
Time := 0;
end;
+ AddCommand('segfault', segfault, 'make segfault');
+
+ AddCommand('bind', BindCommands);
+ AddCommand('bindlist', BindCommands);
+ AddCommand('unbind', BindCommands);
+ AddCommand('unbindall', BindCommands);
+ AddCommand('showkeyboard', BindCommands);
+ AddCommand('hidekeyboard', 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('version', ConsoleCommands);
AddCommand('d_window', DebugCommands);
AddCommand('d_sounds', DebugCommands);
AddCommand('d_health', DebugCommands);
AddCommand('d_player', DebugCommands);
AddCommand('d_joy', DebugCommands);
+ AddCommand('d_mem', DebugCommands);
AddCommand('p1_name', GameCVars);
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);
end;
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);
end;
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;
g_Console_Add('');
for i := 0 to High(commands) do
begin
- if not commands[i].hidden then
+ // hidden commands are hidden when cheats aren't enabled
+ if commands[i].hidden and not conIsCheatsEnabled then continue;
+ if (Length(commands[i].help) > 0) then
begin
- if (Length(commands[i].help) > 0) then
- begin
- g_Console_Add(' '+commands[i].cmd+' -- '+commands[i].help);
- end
- else
- begin
- g_Console_Add(' '+commands[i].cmd);
- end;
+ g_Console_Add(' '+commands[i].cmd+' -- '+commands[i].help);
+ end
+ else
+ begin
+ g_Console_Add(' '+commands[i].cmd);
end;
end;
exit;
ll := Copy(ll, 0, Length(ll)-1);
for i := 0 to High(commands) do
begin
- if commands[i].hidden then continue;
+ // hidden commands are hidden when cheats aren't enabled
+ if commands[i].hidden and not conIsCheatsEnabled then continue;
if (commands[i].cmd = ll) then
begin
if (Length(commands[i].help) > 0) then
tused := 0;
for i := 0 to High(commands) do
begin
- if commands[i].hidden then continue;
+ // hidden commands are hidden when cheats aren't enabled
+ if commands[i].hidden and not conIsCheatsEnabled then continue;
cmd := commands[i].cmd;
if (Length(cmd) >= Length(ll)) and (ll = Copy(cmd, 0, Length(ll))) then
begin
IK_DELETE:
if (Length(Line) > 0) and (CPos <= Length(Line)) then
Delete(Line, CPos, 1);
- IK_LEFT, IK_KPLEFT:
+ IK_LEFT, IK_KPLEFT, VK_LEFT:
if CPos > 1 then
CPos := CPos - 1;
- IK_RIGHT, IK_KPRIGHT:
+ IK_RIGHT, IK_KPRIGHT, VK_RIGHT:
if CPos <= Length(Line) then
CPos := CPos + 1;
- IK_RETURN, IK_KPRETURN:
+ IK_RETURN, IK_KPRETURN, VK_OPEN, VK_FIRE:
begin
if Cons_Shown then
g_Console_Process(Line)
CPos := 1;
gChatShow := False;
gJustChatted := True;
+ g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
end;
end;
IK_TAB:
if not gChatShow then
Complete();
- IK_DOWN, IK_KPDOWN:
+ IK_DOWN, IK_KPDOWN, VK_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:
+ IK_UP, IK_KPUP, VK_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: // PgUp
+ IK_PAGEUP, IK_KPPAGEUP, VK_PREV: // PgUp
if not gChatShow then Inc(conSkipLines);
- IK_PAGEDN, IK_KPPAGEDN: // PgDown
+ IK_PAGEDN, IK_KPPAGEDN, VK_NEXT: // PgDown
if not gChatShow and (conSkipLines > 0) then Dec(conSkipLines);
IK_HOME, IK_KPHOME:
CPos := 1;
end;
end;
-function ParseString(Str: AnsiString): SArray;
+function ParseString(Str: AnsiString): SSArray;
begin
Result := nil;
function g_Console_CommandBlacklisted(C: AnsiString): Boolean;
var
- Arr: SArray;
+ Arr: SSArray;
i: Integer;
begin
Result := True;
procedure g_Console_Process(L: AnsiString; quiet: Boolean = False);
var
- Arr: SArray;
+ Arr: SSArray;
i: Integer;
begin
Arr := nil;
begin
if commands[i].cmd = LowerCase(Arr[0]) then
begin
+ if commands[i].action >= 0 then
+ begin
+ 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);
- 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 := 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 >= 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].down <> nil) or (gInputBinds[key].up <> nil)) then
+ begin
+ 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;
+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;
+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.