diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 97f5c20263a020b6b012bfa77ef438959c797bbd..64b08642029b320c93a0377ae8a56526b94eb821 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
*
* 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
ACTION_SCORES = 6;
ACTION_ACTIVATE = 7;
ACTION_STRAFE = 8;
- ACTION_WEAPNEXT = 9;
- ACTION_WEAPPREV = 10;
FIRST_ACTION = ACTION_JUMP;
- LAST_ACTION = ACTION_WEAPPREV;
+ LAST_ACTION = ACTION_STRAFE;
-procedure g_Console_Init ();
-procedure g_Console_Update ();
-procedure g_Console_Draw ();
-procedure g_Console_Switch ();
+procedure g_Console_Init;
+procedure g_Console_SysInit;
+procedure g_Console_Update;
+procedure g_Console_Draw (MessagesOnly: Boolean = False);
procedure g_Console_Char (C: AnsiChar);
procedure g_Console_Control (K: Word);
procedure g_Console_Process (L: AnsiString; quiet: Boolean=false);
procedure g_Console_Add (L: AnsiString; show: Boolean=false);
-procedure g_Console_Clear ();
+procedure g_Console_Clear;
function g_Console_CommandBlacklisted (C: AnsiString): Boolean;
procedure g_Console_ReadConfig (filename: String);
procedure g_Console_WriteConfig (filename: String);
+procedure g_Console_WriteGameConfig;
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);
+function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean;
+function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer;
+procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''; rep: Boolean = False);
procedure g_Console_ProcessBind (key: Integer; down: Boolean);
+procedure g_Console_ProcessBindRepeat (key: Integer);
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: 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; 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;
+procedure conRegVar (const conname: AnsiString; pvar: PWord; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PCardinal; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PAnsiString; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+
+// <0: no arg; 0/1: true/false
+function conGetBoolArg (p: SSArray; idx: Integer): Integer;
// poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
function conParseFloat (var res: Single; const s: AnsiString): Boolean;
+const
+ {$IFDEF HEADLESS}
+ defaultConfigScript = 'dfserver.cfg';
+ {$ELSE}
+ defaultConfigScript = 'dfconfig.cfg';
+ {$ENDIF}
var
gConsoleShow: Boolean = false; // True - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ
gChatTeam: Boolean = false;
gAllowConsoleMessages: Boolean = true;
gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
- gPlayerAction, gDefaultAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
+ gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà
+ gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
+ gConfigScript: string = defaultConfigScript;
implementation
uses
- g_textures, g_main, e_graphics, e_input, g_game,
- SysUtils, g_basic, g_options, Math, g_touch,
- g_menu, g_language, g_net, g_netmsg, e_log, conbuf;
+ g_textures, g_main, e_graphics, e_input, g_game, g_gfx, g_player, g_items,
+ SysUtils, g_basic, g_options, Math, g_touch, e_res,
+ g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf, g_weapons;
+const
+ autoexecScript = 'autoexec.cfg';
+ configComment = 'generated by doom2d, do not modify';
type
PCommand = ^TCommand;
const
- Step = 32;
- Alpha = 25;
MsgTime = 144;
MaxScriptRecursion = 16;
RecursionDepth: Word = 0;
RecursionLimitHit: Boolean = False;
Cons_Y: SmallInt;
- Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü?
+ ConsoleHeight: Single;
+ Cons_Shown: Boolean; // draw console
+ InputReady: Boolean; // allow text input in console/chat
Line: AnsiString;
CPos: Word;
//ConsoleHistory: SSArray;
Time: Word;
end;
- bindDown, bindProcess: Boolean;
gInputBinds: Array [0..e_MaxInputKeys - 1] of record
- commands: SSArray;
+ rep: Boolean;
+ down, up: SSArray;
end;
+ menu_toggled: BOOLEAN; (* hack for menu controls *)
+ ChatTop: BOOLEAN;
+ ConsoleStep: Single;
+ ConsoleTrans: Single;
+
+procedure g_Console_Switch;
+begin
+ Cons_Y := Min(0, Max(Cons_Y, -Floor(gScreenHeight * ConsoleHeight)));
+ if Cons_Shown = False then
+ Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
+ gChatShow := False;
+ gConsoleShow := not gConsoleShow;
+ Cons_Shown := True;
+ InputReady := False;
+ g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+end;
+
+procedure g_Console_Chat_Switch (Team: Boolean = False);
+begin
+ if not g_Game_IsNet then Exit;
+ Cons_Y := Min(0, Max(Cons_Y, -Floor(gScreenHeight * ConsoleHeight)));
+ if Cons_Shown = False then
+ Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
+ gConsoleShow := False;
+ gChatShow := not gChatShow;
+ gChatTeam := Team;
+ Cons_Shown := True;
+ InputReady := False;
+ Line := '';
+ CPos := 1;
+ g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+end;
// poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
function conParseFloat (var res: Single; const s: AnsiString): Boolean;
procedure boolVarHandler (me: PCommand; p: SSArray);
procedure binaryFlag (var flag: Boolean; msg: AnsiString);
+ var
+ old: Boolean;
begin
if (Length(p) > 2) then
begin
end
else
begin
+ old := flag;
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 flag <> old then
+ g_Console_WriteGameConfig();
if (Length(msg) = 0) then msg := p[0] else msg += ':';
if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]);
end;
procedure intVarHandler (me: PCommand; p: SSArray);
- procedure binaryFlag (var flag: Boolean; msg: AnsiString);
+var
+ old: Integer;
+begin
+ if (Length(p) <> 2) then
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]);
+ conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]);
+ end
+ else
+ begin
+ try
+ old := PInteger(me.ptr)^;
+ PInteger(me.ptr)^ := StrToInt(p[1]);
+ if PInteger(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
+ except
+ conwritefln('invalid integer value: "%s"', [p[1]]);
end;
end;
+end;
+
+
+procedure wordVarHandler (me: PCommand; p: SSArray);
+var
+ old: Integer;
begin
if (Length(p) <> 2) then
begin
else
begin
try
- PInteger(me.ptr)^ := StrToInt(p[1]);
+ old := PWord(me.ptr)^;
+ PWord(me.ptr)^ := min($FFFF, StrToDWord(p[1]));
+ if PWord(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
except
- conwritefln('invalid integer value: "%s"', [p[1]]);
+ conwritefln('invalid word value: "%s"', [p[1]]);
+ end;
+ end;
+end;
+
+
+procedure dwordVarHandler (me: PCommand; p: SSArray);
+var
+ old: Integer;
+begin
+ if (Length(p) <> 2) then
+ begin
+ conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]);
+ end
+ else
+ begin
+ try
+ old := PCardinal(me.ptr)^;
+ PCardinal(me.ptr)^ := StrToDWord(p[1]);
+ if PCardinal(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
+ except
+ conwritefln('invalid dword value: "%s"', [p[1]]);
end;
end;
end;
+procedure strVarHandler (me: PCommand; p: SSArray);
+var
+ old: AnsiString;
+begin
+ if (Length(p) <> 2) then
+ begin
+ conwritefln('%s %s', [me.cmd, QuoteStr(PAnsiString(me.ptr)^)]);
+ end
+ else
+ begin
+ old := PAnsiString(me.ptr)^;
+ PAnsiString(me.ptr)^ := p[1];
+ if PAnsiString(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
+ 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;
end;
+procedure conRegVar (const conname: AnsiString; pvar: PWord; 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 := wordVarHandler;
+ cp.help := ahelp;
+ 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: PCardinal; 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 := dwordVarHandler;
+ cp.help := ahelp;
+ 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: PAnsiString; 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 := strVarHandler;
+ cp.help := ahelp;
+ cp.hidden := ahidden;
+ cp.ptr := pvar;
+ cp.msg := amsg;
+ cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
+end;
+
// ////////////////////////////////////////////////////////////////////////// //
type
PVarSingle = ^TVarSingle;
procedure singleVarHandler (me: PCommand; p: SSArray);
var
pv: PVarSingle;
- nv: Single;
+ nv, old: Single;
msg: AnsiString;
begin
if (Length(p) > 2) then
exit;
end;
pv := PVarSingle(me.ptr);
+ old := pv.val^;
if (Length(p) = 2) then
begin
if me.cheat and (not conIsCheatsEnabled) then begin conwriteln('not available'); exit; end;
pv.val^ := nv;
end;
end;
+ if pv.val^ <> old then
+ g_Console_WriteGameConfig();
msg := me.msg;
if (Length(msg) = 0) then msg := me.cmd else msg += ':';
conwritefln('%s %s', [msg, pv.val^]);
begin
// exec <filename>
if Length(p) = 2 then
- g_Console_ReadConfig(GameDir + '/' + p[1])
+ g_Console_ReadConfig(p[1])
else
g_Console_Add('exec <script file>');
end;
begin
// writeconfig <filename>
if Length(p) = 2 then
- g_Console_WriteConfig(GameDir + '/' + p[1])
+ begin
+ s := e_GetWriteableDir(ConfigDirs);
+ g_Console_WriteConfig(e_CatPath(s, p[1]))
+ end
else
- g_Console_Add('writeconfig <file>');
+ begin
+ g_Console_Add('writeconfig <file>')
+ end
end;
if (cmd = 'ver') or (cmd = 'version') then
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;
+
+function QuoteStr(str: String): String;
+begin
+ if Pos(' ', str) > 0 then
+ Result := '"' + str + '"'
+ else
+ Result := str;
+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> <action>
- if Length(p) = 3 then
+ // bind <key> [down [up]]
+ if (Length(p) >= 2) and (Length(p) <= 4) then
begin
- key := LowerCase(p[1]);
i := 0;
+ key := LowerCase(p[1]);
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(e_KeyNames[i] + ' "' + act + '"')
+ if Length(p) = 2 then
+ g_Console_Add(QuoteStr(e_KeyNames[i]) + ' = ' + QuoteStr(GetCommandString(gInputBinds[i].down)) + ' ' + QuoteStr(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
+ begin
+ g_Console_Add('bind <key> <down action> [up action]')
end;
+ 'bindrep':
+ // bindrep <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
+ gInputBinds[i].rep := True
+ else
+ g_Console_Add('bindrep: "' + p[1] + '" is not a key')
+ end
+ else
+ g_Console_Add('bindrep <key>');
+ 'bindunrep':
+ // bindunrep <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
+ gInputBinds[i].rep := False
+ else
+ g_Console_Add('bindunrep: "' + p[1] + '" is not a key')
+ end
+ else
+ g_Console_Add('bindunrep <key>');
+ 'bindlist':
+ for i := 0 to e_MaxInputKeys - 1 do
+ if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then
+ g_Console_Add(e_KeyNames[i] + ' ' + QuoteStr(GetCommandString(gInputBinds[i].down)) + ' ' + QuoteStr(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, '')
- end;
+ else
+ g_Console_Add('unbind: "' + p[1] + '" is not a key')
+ 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;
+ g_Console_BindKey(i, '');
+ 'showkeyboard':
+ g_Touch_ShowKeyboard(True);
+ 'hidekeyboard':
+ g_Touch_ShowKeyboard(False);
+ 'togglemenu':
+ begin
+ if gConsoleShow then
+ g_Console_Switch
+ else if gChatShow then
+ g_Console_Chat_Switch
+ else
+ KeyPress(VK_ESCAPE);
+ menu_toggled := True
+ end;
+ 'toggleconsole':
+ g_Console_Switch;
+ 'togglechat':
+ g_Console_Chat_Switch;
+ 'toggleteamchat':
+ if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
+ g_Console_Chat_Switch(True);
end
end;
end
end;
-procedure g_Console_Init();
- var
- a: Integer;
+procedure g_Console_SysInit;
+ var a: Integer;
begin
- g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
- Cons_Y := -(gScreenHeight div 2);
+ Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
gConsoleShow := False;
gChatShow := False;
Cons_Shown := False;
+ InputReady := False;
CPos := 1;
for a := 0 to High(MsgArray) do
AddCommand('segfault', segfault, 'make segfault');
+ AddCommand('quit', SystemCommands);
+ AddCommand('exit', SystemCommands);
+ AddCommand('r_reset', SystemCommands);
+ AddCommand('r_maxfps', SystemCommands);
+ AddCommand('g_language', SystemCommands);
+
AddCommand('bind', BindCommands);
+ AddCommand('bindrep', BindCommands);
+ AddCommand('bindunrep', BindCommands);
AddCommand('bindlist', BindCommands);
AddCommand('unbind', BindCommands);
AddCommand('unbindall', BindCommands);
- AddCommand('bindkeys', BindCommands);
+ AddCommand('showkeyboard', BindCommands);
+ AddCommand('hidekeyboard', BindCommands);
+ AddCommand('togglemenu', BindCommands);
+ AddCommand('toggleconsole', BindCommands);
+ AddCommand('togglechat', BindCommands);
+ AddCommand('toggleteamchat', BindCommands);
AddCommand('clear', ConsoleCommands, 'clear console');
AddCommand('clearhistory', ConsoleCommands);
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_showtime', GameCVars);
- AddCommand('r_showscore', GameCVars);
- AddCommand('r_showlives', GameCVars);
- AddCommand('r_showstat', GameCVars);
- AddCommand('r_showkillmsg', GameCVars);
- AddCommand('r_showspect', GameCVars);
- AddCommand('r_showping', GameCVars);
+ AddCommand('p1_name', PlayerSettingsCVars);
+ AddCommand('p2_name', PlayerSettingsCVars);
+ AddCommand('p1_color', PlayerSettingsCVars);
+ AddCommand('p2_color', PlayerSettingsCVars);
+ AddCommand('p1_model', PlayerSettingsCVars);
+ AddCommand('p2_model', PlayerSettingsCVars);
+ AddCommand('p1_team', PlayerSettingsCVars);
+ AddCommand('p2_team', PlayerSettingsCVars);
+ AddCommand('p1_autoswitch', PlayerSettingsCVars);
+ AddCommand('p2_autoswitch', PlayerSettingsCVars);
+ AddCommand('p1_switch_empty', PlayerSettingsCVars);
+ AddCommand('p2_switch_empty', PlayerSettingsCVars);
+ AddCommand('p1_skip_fist', PlayerSettingsCVars);
+ AddCommand('p2_skip_fist', PlayerSettingsCVars);
+ AddCommand('p1_priority_kastet', PlayerSettingsCVars);
+ AddCommand('p2_priority_kastet', PlayerSettingsCVars);
+ AddCommand('p1_priority_saw', PlayerSettingsCVars);
+ AddCommand('p2_priority_saw', PlayerSettingsCVars);
+ AddCommand('p1_priority_pistol', PlayerSettingsCVars);
+ AddCommand('p2_priority_pistol', PlayerSettingsCVars);
+ AddCommand('p1_priority_shotgun1', PlayerSettingsCVars);
+ AddCommand('p2_priority_shotgun1', PlayerSettingsCVars);
+ AddCommand('p1_priority_shotgun2', PlayerSettingsCVars);
+ AddCommand('p2_priority_shotgun2', PlayerSettingsCVars);
+ AddCommand('p1_priority_chaingun', PlayerSettingsCVars);
+ AddCommand('p2_priority_chaingun', PlayerSettingsCVars);
+ AddCommand('p1_priority_rocketlauncher', PlayerSettingsCVars);
+ AddCommand('p2_priority_rocketlauncher', PlayerSettingsCVars);
+ AddCommand('p1_priority_plasma', PlayerSettingsCVars);
+ AddCommand('p2_priority_plasma', PlayerSettingsCVars);
+ AddCommand('p1_priority_bfg', PlayerSettingsCVars);
+ AddCommand('p2_priority_bfg', PlayerSettingsCVars);
+ AddCommand('p1_priority_super', PlayerSettingsCVars);
+ AddCommand('p2_priority_super', PlayerSettingsCVars);
+ AddCommand('p1_priority_flamethrower', PlayerSettingsCVars);
+ AddCommand('p2_priority_flamethrower', PlayerSettingsCVars);
+ AddCommand('p1_priority_berserk', PlayerSettingsCVars);
+ AddCommand('p2_priority_berserk', PlayerSettingsCVars);
+
+ AddCommand('g_max_particles', GameCVars);
+ AddCommand('g_max_shells', GameCVars);
+ AddCommand('g_max_gibs', GameCVars);
+ AddCommand('g_max_corpses', GameCVars);
AddCommand('g_gamemode', GameCVars);
AddCommand('g_friendlyfire', GameCVars);
+ AddCommand('g_friendly_hit_trace', GameCVars);
+ AddCommand('g_friendly_hit_projectile', GameCVars);
+ AddCommand('g_friendly_absorb_damage', GameCVars);
AddCommand('g_weaponstay', GameCVars);
AddCommand('g_allow_exit', GameCVars);
+ AddCommand('g_dm_keys', GameCVars);
AddCommand('g_allow_monsters', GameCVars);
+ AddCommand('g_allow_dropflag', GameCVars);
+ AddCommand('g_throw_flag', GameCVars);
AddCommand('g_bot_vsmonsters', GameCVars);
AddCommand('g_bot_vsplayers', GameCVars);
+ AddCommand('g_max_bots', GameCVars); // intentionally not whitelisted
AddCommand('g_scorelimit', GameCVars);
AddCommand('g_timelimit', GameCVars);
AddCommand('g_maxlives', GameCVars);
- AddCommand('g_warmuptime', GameCVars);
- AddCommand('net_interp', GameCVars);
- AddCommand('net_forceplayerupdate', GameCVars);
- AddCommand('net_predictself', GameCVars);
- AddCommand('sv_name', GameCVars);
- AddCommand('sv_passwd', GameCVars);
- AddCommand('sv_maxplrs', GameCVars);
- AddCommand('sv_public', GameCVars);
+ AddCommand('g_warmup_time', GameCVars);
+ AddCommand('g_spawn_invul', GameCVars);
+ AddCommand('g_item_respawn_time', GameCVars);
AddCommand('sv_intertime', GameCVars);
- AddCommand('quit', GameCommands);
- AddCommand('exit', GameCommands);
+ AddCommand('sv_name', NetServerCVars);
+ AddCommand('sv_passwd', NetServerCVars);
+ AddCommand('sv_maxplrs', NetServerCVars);
+ AddCommand('sv_public', NetServerCVars);
+ AddCommand('sv_port', NetServerCVars);
+
AddCommand('pause', GameCommands);
AddCommand('endgame', GameCommands);
AddCommand('restart', GameCommands);
AddCommand('bot_removeall', GameCommands);
AddCommand('chat', GameCommands);
AddCommand('teamchat', GameCommands);
+ AddCommand('announce', GameCommands);
+ AddCommand('an', GameCommands);
AddCommand('game', GameCommands);
AddCommand('host', GameCommands);
AddCommand('map', GameCommands);
AddCommand('ready', GameCommands);
AddCommand('kick', GameCommands);
AddCommand('kick_id', GameCommands);
+ AddCommand('kick_pid', GameCommands);
AddCommand('ban', GameCommands);
- AddCommand('permban', GameCommands);
AddCommand('ban_id', GameCommands);
+ AddCommand('ban_pid', GameCommands);
+ AddCommand('permban', GameCommands);
AddCommand('permban_id', GameCommands);
+ AddCommand('permban_pid', GameCommands);
+ AddCommand('permban_ip', GameCommands);
AddCommand('unban', GameCommands);
AddCommand('connect', GameCommands);
AddCommand('disconnect', GameCommands);
AddCommand('reconnect', GameCommands);
AddCommand('say', GameCommands);
AddCommand('tell', GameCommands);
+ AddCommand('centerprint', GameCommands);
AddCommand('overtime', GameCommands);
AddCommand('rcon_password', GameCommands);
AddCommand('rcon', GameCommands);
AddCommand('clientlist', GameCommands);
AddCommand('event', GameCommands);
AddCommand('screenshot', GameCommands);
- AddCommand('togglechat', GameCommands);
- AddCommand('toggleteamchat', GameCommands);
+ AddCommand('weapnext', GameCommands);
+ AddCommand('weapprev', GameCommands);
AddCommand('weapon', GameCommands);
+ AddCommand('dropflag', GameCommands);
+ AddCommand('p1_weapnext', GameCommands);
+ AddCommand('p1_weapprev', GameCommands);
AddCommand('p1_weapon', GameCommands);
+ AddCommand('p1_weapbest', GameCommands);
+ AddCommand('p1_dropflag', GameCommands);
+ AddCommand('p2_weapnext', GameCommands);
+ AddCommand('p2_weapprev', GameCommands);
AddCommand('p2_weapon', GameCommands);
+ AddCommand('p2_weapbest', GameCommands);
+ AddCommand('p2_dropflag', GameCommands);
AddCommand('god', GameCheats);
AddCommand('notarget', GameCheats);
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('endmap');
WhitelistCommand('restart');
WhitelistCommand('kick');
+ WhitelistCommand('kick_pid');
WhitelistCommand('ban');
+ WhitelistCommand('ban_pid');
+ WhitelistCommand('centerprint');
WhitelistCommand('addbot');
WhitelistCommand('bot_add');
WhitelistCommand('g_gamemode');
WhitelistCommand('g_friendlyfire');
+ WhitelistCommand('g_friendly_hit_trace');
+ WhitelistCommand('g_friendly_hit_projectile');
+ WhitelistCommand('g_friendly_absorb_damage');
WhitelistCommand('g_weaponstay');
WhitelistCommand('g_allow_exit');
+ WhitelistCommand('g_dm_keys');
WhitelistCommand('g_allow_monsters');
+ WhitelistCommand('g_bot_vsmonsters');
+ WhitelistCommand('g_bot_vsplayers');
WhitelistCommand('g_scorelimit');
WhitelistCommand('g_timelimit');
+ WhitelistCommand('g_maxlives');
+ WhitelistCommand('g_warmup_time');
+ WhitelistCommand('g_spawn_invul');
+ WhitelistCommand('g_item_respawn_time');
g_Console_ResetBinds;
- g_Console_ReadConfig(GameDir + '/dfconfig.cfg');
- g_Console_ReadConfig(GameDir + '/autoexec.cfg');
+ g_Console_ReadConfig(gConfigScript);
+ g_Console_ReadConfig(autoexecScript);
+ gParsingBinds := False;
+end;
+procedure g_Console_Init;
+begin
+ g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
g_Console_Add('');
end;
-procedure g_Console_Update();
+procedure g_Console_Update;
var
- a, b: Integer;
+ a, b, Step: Integer;
begin
if Cons_Shown then
begin
- // Â ïðîöåññå îòêðûòèÿ:
- if gConsoleShow and (Cons_Y < 0) then
+ Step := Max(1, Round(Floor(gScreenHeight * ConsoleHeight) * ConsoleStep));
+ if gConsoleShow then
begin
- Cons_Y := Cons_Y+Step;
- end;
-
- // Â ïðîöåññå çàêðûòèÿ:
- if (not gConsoleShow) and
- (Cons_Y > -(gScreenHeight div 2)) then
- Cons_Y := Cons_Y-Step;
-
- // Îêîí÷àòåëüíî îòêðûëàñü:
- if Cons_Y > 0 then
- Cons_Y := 0;
-
- // Îêîí÷àòåëüíî çàêðûëàñü:
- if Cons_Y <= (-(gScreenHeight div 2)) then
+ (* Open animation *)
+ Cons_Y := Min(Cons_Y + Step, 0);
+ InputReady := True
+ end
+ else
begin
- Cons_Y := -(gScreenHeight div 2);
- Cons_Shown := False;
+ (* Close animation *)
+ Cons_Y := Max(Cons_Y - Step, -Floor(gScreenHeight * ConsoleHeight));
+ Cons_Shown := Cons_Y > -Floor(gScreenHeight * ConsoleHeight);
+ InputReady := False
end;
+
+ if gChatShow then
+ InputReady := True
end;
a := 0;
begin
e_TextureFontGetSize(gStdFont, CWidth, CHeight);
- ty := (gScreenHeight div 2)-4-2*CHeight-Abs(Cons_Y);
+ ty := Floor(gScreenHeight * ConsoleHeight) - 4 - 2 * CHeight - Abs(Cons_Y);
skip := conSkipLines;
cbufLastLine(sp, ep);
repeat
until not cbufLineUp(sp, ep);
end;
-procedure g_Console_Draw();
+procedure g_Console_Draw(MessagesOnly: Boolean = False);
var
CWidth, CHeight: Byte;
mfW, mfH: Word;
- a, b: Integer;
+ a, b, offset_y: Integer;
begin
e_TextureFontGetSize(gStdFont, CWidth, CHeight);
+ if ChatTop and gChatShow then
+ offset_y := CHeight
+ else
+ offset_y := 0;
+
for a := 0 to High(MsgArray) do
if MsgArray[a].Time > 0 then
- e_TextureFontPrintFmt(0, CHeight*a, MsgArray[a].Msg,
- gStdFont, True);
+ e_TextureFontPrintFmt(0, offset_y + CHeight * a, MsgArray[a].Msg, gStdFont, True);
- if not Cons_Shown then
+ if MessagesOnly then Exit;
+
+ if gChatShow then
begin
- if gChatShow then
+ if ChatTop then
+ offset_y := 0
+ else
+ offset_y := gScreenHeight - CHeight - 1;
+ if gChatTeam then
begin
- if gChatTeam then
- begin
- e_TextureFontPrintEx(0, gScreenHeight - CHeight - 1, 'say team> ' + Line,
- gStdFont, 255, 255, 255, 1, True);
- e_TextureFontPrintEx((CPos + 9)*CWidth, gScreenHeight - CHeight - 1, '_',
- gStdFont, 255, 255, 255, 1, True);
- end
- else
- begin
- e_TextureFontPrintEx(0, gScreenHeight - CHeight - 1, 'say> ' + Line,
- gStdFont, 255, 255, 255, 1, True);
- e_TextureFontPrintEx((CPos + 4)*CWidth, gScreenHeight - CHeight - 1, '_',
- gStdFont, 255, 255, 255, 1, True);
- end;
- end;
- Exit;
+ e_TextureFontPrintEx(0, offset_y, 'say team> ' + Line, gStdFont, 255, 255, 255, 1, True);
+ e_TextureFontPrintEx((CPos + 9) * CWidth, offset_y, '_', gStdFont, 255, 255, 255, 1, True);
+ end
+ else
+ begin
+ e_TextureFontPrintEx(0, offset_y, 'say> ' + Line, gStdFont, 255, 255, 255, 1, True);
+ e_TextureFontPrintEx((CPos + 4) * CWidth, offset_y, '_', gStdFont, 255, 255, 255, 1, True);
+ end
end;
+ if not Cons_Shown then
+ Exit;
+
if gDebugMode then
begin
e_CharFont_GetSize(gMenuFont, DEBUG_STRING, mfW, mfH);
a := (gScreenWidth - 2*mfW) div 2;
- b := Cons_Y + ((gScreenHeight div 2) - 2*mfH) div 2;
+ b := Cons_Y + (Floor(gScreenHeight * ConsoleHeight) - 2 * mfH) div 2;
e_CharFont_PrintEx(gMenuFont, a div 2, b div 2, DEBUG_STRING,
_RGB(128, 0, 0), 2.0);
end;
- e_DrawSize(ID, 0, Cons_Y, Alpha, False, False, gScreenWidth, gScreenHeight div 2);
- e_TextureFontPrint(0, Cons_Y+(gScreenHeight div 2)-CHeight-4, '> '+Line, gStdFont);
+ e_DrawSize(ID, 0, Cons_Y, Round(ConsoleTrans * 255), False, False, gScreenWidth, Floor(gScreenHeight * ConsoleHeight));
+ e_TextureFontPrint(0, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - CHeight - 4, '> ' + Line, gStdFont);
drawConsoleText();
(*
begin
b := 0;
if CHeight > 0 then
- if Length(ConsoleHistory) > ((gScreenHeight div 2) div CHeight)-1 then
- b := Length(ConsoleHistory)-((gScreenHeight div 2) div CHeight)+1;
+ if Length(ConsoleHistory) > (Floor(gScreenHeight * ConsoleHeight) div CHeight) - 1 then
+ b := Length(ConsoleHistory) - (Floor(gScreenHeight * ConsoleHeight) div CHeight) + 1;
b := Max(b-Offset, 0);
d := Max(High(ConsoleHistory)-Offset, 0);
c := 2;
for a := d downto b do
begin
- e_TextureFontPrintFmt(0, (gScreenHeight div 2)-4-c*CHeight-Abs(Cons_Y), ConsoleHistory[a],
- gStdFont, True);
+ e_TextureFontPrintFmt(0, Floor(gScreenHeight * ConsoleHeight) - 4 - c * CHeight - Abs(Cons_Y), ConsoleHistory[a], gStdFont, True);
c := c + 1;
end;
end;
*)
- e_TextureFontPrint((CPos+1)*CWidth, Cons_Y+(gScreenHeight div 2)-21, '_', gStdFont);
-end;
-
-procedure g_Console_Switch();
-begin
- 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 not g_Game_IsNet then Exit;
- gConsoleShow := False;
- gChatShow := not gChatShow;
- gChatTeam := Team;
- Line := '';
- CPos := 1;
- g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+ e_TextureFontPrint((CPos + 1) * CWidth, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - 21, '_', gStdFont);
end;
procedure g_Console_Char(C: AnsiChar);
begin
-// if gChatShow then
-// Exit;
- Insert(C, Line, CPos);
- CPos := CPos + 1;
+ if InputReady and (gConsoleShow or gChatShow) then
+ begin
+ Insert(C, Line, CPos);
+ CPos := CPos + 1;
+ end
end;
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
+ if gConsoleShow then
g_Console_Process(Line)
else
if gChatShow then
Line := '';
CPos := 1;
- gChatShow := False;
gJustChatted := True;
- g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+ g_Console_Chat_Switch;
+ InputReady := False;
end;
end;
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;
IK_END, IK_KPEND:
CPos := Length(Line) + 1;
- end;
+ IK_A..IK_Z, IK_SPACE, IK_SHIFT, IK_RSHIFT, IK_CAPSLOCK, IK_LBRACKET, IK_RBRACKET,
+ IK_SEMICOLON, IK_QUOTE, IK_BACKSLASH, IK_SLASH, IK_COMMA, IK_DOT, (*IK_EQUALS,*)
+ IK_0, IK_1, IK_2, IK_3, IK_4, IK_5, IK_6, IK_7, IK_8, IK_9, IK_MINUS, IK_EQUALS:
+ (* see TEXTINPUT event *)
+ end
end;
function GetStr(var Str: AnsiString): AnsiString;
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; cmd: AnsiString);
+procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''; rep: Boolean = False);
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)
+ begin
+ gInputBinds[key].rep := rep;
+ gInputBinds[key].down := ParseAlias(down);
+ gInputBinds[key].up := ParseAlias(up);
+ end;
+ g_Console_WriteGameConfig();
+end;
+
+function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean;
+
+ 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(key >= 0);
+ ASSERT(key < e_MaxInputKeys);
+ result := EqualsCommandLists(ParseAlias(down), gInputBinds[key].down) and EqualsCommandLists(ParseAlias(up), gInputBinds[key].up)
end;
-function g_Console_FindBind (n: Integer; cmd: AnsiString): Integer;
+function g_Console_FindBind (n: Integer; down: AnsiString; up: 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
+ if g_Console_MatchBind(i, down, up) then
begin
result := i;
dec(n)
Result := i < len
end;
+function BindsAllowed (key: Integer): Boolean;
+begin
+ Result := False;
+ if (not g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
+ begin
+ if gChatShow then
+ Result := g_Console_MatchBind(key, 'togglemenu') or
+ g_Console_MatchBind(key, 'showkeyboard') or
+ g_Console_MatchBind(key, 'hidekeyboard')
+ else if gConsoleShow or (g_ActiveWindow <> nil) or (gGameSettings.GameType = GT_NONE) then
+ Result := g_Console_MatchBind(key, 'togglemenu') or
+ g_Console_MatchBind(key, 'toggleconsole') or
+ g_Console_MatchBind(key, 'showkeyboard') or
+ g_Console_MatchBind(key, 'hidekeyboard')
+ else (* in game *)
+ Result := True
+ end
+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
+ if BindsAllowed(key) 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
+ 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;
+ if down and not menu_toggled then
+ KeyPress(key);
+ menu_toggled := False
+end;
+
+procedure g_Console_ProcessBindRepeat (key: Integer);
+ var i: Integer;
+begin
+ if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
+ begin
+ KeyPress(key); // key repeat in menus and shit
+ Exit;
+ end;
+ if BindsAllowed(key) and gInputBinds[key].rep then
+ begin
+ for i := 0 to High(gInputBinds[key].down) do
+ g_Console_Process(gInputBinds[key].down[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');
- 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(i, '', '');
+
+ g_Console_BindKey(IK_GRAVE, 'toggleconsole');
+ 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');
+ 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_ALT, '+p1_strafe', '-p1_strafe');
+ g_Console_BindKey(IK_E, 'p1_weapnext', '', True);
+ g_Console_BindKey(IK_Q, 'p1_weapprev', '', True);
+ g_Console_BindKey(IK_R, 'p1_dropflag', '');
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_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_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');
- 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');
+ 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, 7), '+p' + IntToStr(i mod 2 + 1) + '_strafe', '-p' + IntToStr(i mod 2 + 1) + '_strafe');
+ g_Console_BindKey(e_JoyButtonToKey(i, 1), 'p' + IntToStr(i mod 2 + 1) + '_weapnext', '', True);
+ g_Console_BindKey(e_JoyButtonToKey(i, 4), 'p' + IntToStr(i mod 2 + 1) + '_weapprev', '', True);
+ g_Console_BindKey(e_JoyButtonToKey(i, 10), 'togglemenu');
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_ESCAPE, 'togglemenu');
+ 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_STRAFE, '+strafe', '-strafe');
+ g_Console_BindKey(VK_NEXT, 'weapnext', '', True);
+ g_Console_BindKey(VK_PREV, 'weapprev', '', True);
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_A, 'weapon 11');
g_Console_BindKey(VK_CHAT, 'togglechat');
g_Console_BindKey(VK_TEAM, 'toggleteamchat');
+ g_Console_BindKey(VK_CONSOLE, 'toggleconsole');
g_Console_BindKey(VK_PRINTSCR, 'screenshot');
- g_Console_BindKey(VK_STATUS, '+scores');
-
- // VK_CONSOLE
- // VK_ESCAPE
+ g_Console_BindKey(VK_STATUS, '+scores', '-scores');
+ g_Console_BindKey(VK_SHOWKBD, 'showkeyboard');
+ g_Console_BindKey(VK_HIDEKBD, 'hidekeyboard');
end;
procedure g_Console_ReadConfig (filename: String);
var f: TextFile; s: AnsiString; i, len: Integer;
begin
- if FileExists(filename) then
+ e_LogWritefln('g_Console_ReadConfig (1) "%s"', [filename]);
+ if e_FindResource(ConfigDirs, filename, false) = true then
begin
+ e_LogWritefln('g_Console_ReadConfig (2) "%s"', [filename]);
AssignFile(f, filename);
Reset(f);
while not EOF(f) do
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)
+ g_Console_Process(s, True);
end
end;
- CloseFile(f)
+ CloseFile(f);
end
end;
procedure g_Console_WriteConfig (filename: String);
- var f: TextFile; i, j: Integer; act: AnsiString;
+ var f: TextFile; i, j: Integer;
+
+ procedure WriteFlag(name: string; flag: LongWord);
+ begin
+ WriteLn(f, name, IfThen(LongBool(gsGameFlags and flag), 1, 0));
+ end;
+
+ function FormatTeam(team: Byte): string;
+ begin
+ if team = TEAM_BLUE then
+ result := 'blue'
+ else
+ result := 'red';
+ end;
+
begin
AssignFile(f, filename);
Rewrite(f);
- WriteLn(f, '// generated by doom2d, do not modify');
+ WriteLn(f, '// ' + configComment);
+
+ // binds
WriteLn(f, 'unbindall');
for i := 0 to e_MaxInputKeys - 1 do
- begin
- if Length(gInputBinds[i].commands) > 0 then
+ if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 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 ', e_KeyNames[i], ' "', act, '"')
- end
+ Write(f, 'bind ', e_KeyNames[i], ' ', QuoteStr(GetCommandString(gInputBinds[i].down)));
+ if Length(gInputBinds[i].down) = 0 then
+ Write(f, '""');
+ if Length(gInputBinds[i].up) > 0 then
+ Write(f, ' ', QuoteStr(GetCommandString(gInputBinds[i].up)));
+ WriteLn(f, '');
+ if gInputBinds[i].rep then
+ WriteLn(f, 'bindrep ', e_KeyNames[i]);
+ end;
+
+ // lang
+ if gAskLanguage then
+ WriteLn(f, 'g_language ask')
+ else
+ WriteLn(f, 'g_language ', gLanguage);
+
+ // net server
+ WriteLn(f, 'sv_name ', QuoteStr(NetServerName));
+ WriteLn(f, 'sv_passwd ', QuoteStr(NetPassword));
+ WriteLn(f, 'sv_maxplrs ', NetMaxClients);
+ WriteLn(f, 'sv_port ', NetPort);
+ WriteLn(f, 'sv_public ', IfThen(NetUseMaster, 1, 0));
+
+ // game settings
+ WriteLn(f, 'g_max_particles ', g_GFX_GetMax());
+ WriteLn(f, 'g_max_shells ', g_Shells_GetMax());
+ WriteLn(f, 'g_max_gibs ', g_Gibs_GetMax());
+ WriteLn(f, 'g_max_corpses ', g_Corpses_GetMax());
+ WriteLn(f, 'sv_intertime ', gDefInterTime);
+
+ // gameplay settings
+ WriteLn(f, 'g_gamemode ', gsGameMode);
+ WriteLn(f, 'g_scorelimit ', gsGoalLimit);
+ WriteLn(f, 'g_timelimit ', gsTimeLimit);
+ WriteLn(f, 'g_maxlives ', gsMaxLives);
+ WriteLn(f, 'g_item_respawn_time ', gsItemRespawnTime);
+ WriteLn(f, 'g_spawn_invul ', gsSpawnInvul);
+ WriteLn(f, 'g_warmup_time ', gsWarmupTime);
+
+ WriteFlag('g_friendlyfire ', GAME_OPTION_TEAMDAMAGE);
+ WriteFlag('g_friendly_hit_trace ', GAME_OPTION_TEAMHITTRACE);
+ WriteFlag('g_friendly_hit_projectile ', GAME_OPTION_TEAMHITPROJECTILE);
+ WriteFlag('g_allow_exit ', GAME_OPTION_ALLOWEXIT);
+ WriteFlag('g_allow_monsters ', GAME_OPTION_MONSTERS);
+ WriteFlag('g_allow_dropflag ', GAME_OPTION_ALLOWDROPFLAG);
+ WriteFlag('g_throw_flag ', GAME_OPTION_THROWFLAG);
+ WriteFlag('g_dm_keys ', GAME_OPTION_DMKEYS);
+ WriteFlag('g_weaponstay ', GAME_OPTION_WEAPONSTAY);
+ WriteFlag('g_bot_vsmonsters ', GAME_OPTION_BOTVSMONSTER);
+ WriteFlag('g_bot_vsplayers ', GAME_OPTION_BOTVSPLAYER);
+
+ // players
+ with gPlayer1Settings do
+ begin
+ WriteLn(f, 'p1_name ', QuoteStr(Name));
+ WriteLn(f, 'p1_color ', Color.R, ' ', Color.G, ' ', Color.B);
+ WriteLn(f, 'p1_model ', QuoteStr(Model));
+ WriteLn(f, 'p1_team ', FormatTeam(Team));
+ WriteLn(f, 'p1_autoswitch ', WeaponSwitch);
+ WriteLn(f, 'p1_switch_empty ', SwitchToEmpty);
+ WriteLn(f, 'p1_priority_kastet ', Max(0, WeaponPreferences[WEAPON_KASTET]));
+ WriteLn(f, 'p1_priority_saw ', Max(0, WeaponPreferences[WEAPON_SAW]));
+ WriteLn(f, 'p1_priority_pistol ', Max(0, WeaponPreferences[WEAPON_PISTOL]));
+ WriteLn(f, 'p1_priority_shotgun1 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN1]));
+ WriteLn(f, 'p1_priority_shotgun2 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN2] ));
+ WriteLn(f, 'p1_priority_chaingun ', Max(0, WeaponPreferences[WEAPON_CHAINGUN]));
+ WriteLn(f, 'p1_priority_rocketlauncher ', Max(0, WeaponPreferences[WEAPON_ROCKETLAUNCHER]));
+ WriteLn(f, 'p1_priority_plasma ', Max(0, WeaponPreferences[WEAPON_PLASMA]));
+ WriteLn(f, 'p1_priority_bfg ', Max(0, WeaponPreferences[WEAPON_BFG]));
+ WriteLn(f, 'p1_priority_super ', Max(0, WeaponPreferences[WEAPON_SUPERPULEMET]));
+ WriteLn(f, 'p1_priority_flamethrower ', Max(0, WeaponPreferences[WEAPON_FLAMETHROWER]));
+ WriteLn(f, 'p1_priority_berserk ', Max(0, WeaponPreferences[WP_LAST+1]));
+ //
end;
+ with gPlayer2Settings do
+ begin
+ WriteLn(f, 'p2_name ', QuoteStr(Name));
+ WriteLn(f, 'p2_color ', Color.R, ' ', Color.G, ' ', Color.B);
+ WriteLn(f, 'p2_model ', QuoteStr(Model));
+ WriteLn(f, 'p2_team ', FormatTeam(Team));
+ WriteLn(f, 'p2_autoswitch ', WeaponSwitch);
+ WriteLn(f, 'p2_switch_empty ', SwitchToEmpty);
+ WriteLn(f, 'p2_priority_kastet ', Max(0, WeaponPreferences[WEAPON_KASTET]));
+ WriteLn(f, 'p2_priority_saw ', Max(0, WeaponPreferences[WEAPON_SAW]));
+ WriteLn(f, 'p2_priority_pistol ', Max(0, WeaponPreferences[WEAPON_PISTOL]));
+ WriteLn(f, 'p2_priority_shotgun1 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN1]));
+ WriteLn(f, 'p2_priority_shotgun2 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN1]));
+ WriteLn(f, 'p2_priority_chaingun ', Max(0, WeaponPreferences[WEAPON_CHAINGUN]));
+ WriteLn(f, 'p2_priority_rocketlauncher ', Max(0, WeaponPreferences[WEAPON_ROCKETLAUNCHER]));
+ WriteLn(f, 'p2_priority_plasma ', Max(0, WeaponPreferences[WEAPON_PLASMA]));
+ WriteLn(f, 'p2_priority_bfg ', Max(0, WeaponPreferences[WEAPON_BFG]));
+ WriteLn(f, 'p2_priority_super ', Max(0, WeaponPreferences[WEAPON_SUPERPULEMET]));
+ WriteLn(f, 'p2_priority_flamethrower ', Max(0, WeaponPreferences[WEAPON_FLAMETHROWER]));
+ WriteLn(f, 'p2_priority_berserk ', Max(0, WeaponPreferences[WP_LAST+1]));
+ end;
+
+ // all cvars
for i := 0 to High(commands) do
begin
if not commands[i].cheat then
if @commands[i].procEx = @boolVarHandler then
begin
if PBoolean(commands[i].ptr)^ then j := 1 else j := 0;
- WriteLn(f, commands[i].cmd, ' "', j, '"')
+ WriteLn(f, commands[i].cmd, ' ', j)
end
else if @commands[i].procEx = @intVarHandler then
begin
- WriteLn(f, commands[i].cmd, ' "', PInteger(commands[i].ptr)^, '"')
+ WriteLn(f, commands[i].cmd, ' ', PInteger(commands[i].ptr)^)
+ end
+ else if @commands[i].procEx = @wordVarHandler then
+ begin
+ WriteLn(f, commands[i].cmd, ' ', PWord(commands[i].ptr)^)
+ end
+ else if @commands[i].procEx = @dwordVarHandler then
+ begin
+ WriteLn(f, commands[i].cmd, ' ', PCardinal(commands[i].ptr)^)
end
else if @commands[i].procEx = @singleVarHandler then
begin
- WriteLn(f, commands[i].cmd, ' "', PVarSingle(commands[i].ptr).val^:0:6, '"')
+ WriteLn(f, commands[i].cmd, ' ', PVarSingle(commands[i].ptr).val^:0:6)
+ end
+ else if @commands[i].procEx = @strVarHandler then
+ begin
+ if Length(PAnsiString(commands[i].ptr)^) = 0 then
+ WriteLn(f, commands[i].cmd, ' ""')
+ else
+ WriteLn(f, commands[i].cmd, ' ', QuoteStr(PAnsiString(commands[i].ptr)^))
end
end
end;
+
+ WriteLn(f, 'r_maxfps ', gMaxFPS);
+ WriteLn(f, 'r_reset');
CloseFile(f)
end;
+procedure g_Console_WriteGameConfig;
+ var s: AnsiString;
+begin
+ if gParsingBinds = false then
+ begin
+ s := e_GetWriteableDir(ConfigDirs);
+ g_Console_WriteConfig(e_CatPath(s, gConfigScript))
+ end
+end;
+
+procedure Init;
+ var i: Integer;
+begin
+ conRegVar('chat_at_top', @ChatTop, 'draw chat at top border', 'draw chat at top border');
+ conRegVar('console_height', @ConsoleHeight, 0.0, 1.0, 'set console size', 'set console size');
+ conRegVar('console_trans', @ConsoleTrans, 0.0, 1.0, 'set console transparency', 'set console transparency');
+ conRegVar('console_step', @ConsoleStep, 0.0, 1.0, 'set console animation speed', 'set console animation speed');
+{$IFDEF ANDROID}
+ ChatTop := True;
+ ConsoleHeight := 0.35;
+{$ELSE}
+ ChatTop := False;
+ ConsoleHeight := 0.5;
+{$ENDIF}
+ ConsoleTrans := 0.1;
+ ConsoleStep := 0.07;
+ conRegVar('d_eres', @debug_e_res, '', '');
+ for i := 1 to e_MaxJoys do
+ conRegVar('joy' + IntToStr(i) + '_deadzone', @e_JoystickDeadzones[i - 1], '', '')
+end;
+initialization
+ Init
end.