diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 53f1c4f1a9998d3c328b2f8fd29be4c4a52e720c..9a8fd1188eb6c3269a040c4253d8000cac2082d4 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
FIRST_ACTION = ACTION_JUMP;
LAST_ACTION = ACTION_WEAPPREV;
+ var (* private state *)
+ Line: AnsiString;
+ CPos: Word;
+ conSkipLines: Integer;
+ MsgArray: Array [0..4] of record
+ Msg: AnsiString;
+ Time: Word;
+ end;
+
procedure g_Console_Init;
+procedure g_Console_Initialize;
+procedure g_Console_Finalize;
procedure g_Console_Update;
-procedure g_Console_Draw;
procedure g_Console_Char (C: AnsiChar);
procedure g_Console_Control (K: Word);
procedure g_Console_Process (L: AnsiString; quiet: Boolean=false);
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_ProcessBindRepeat (key: Integer);
procedure g_Console_ResetBinds;
procedure conwriteln (const s: AnsiString; show: 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
+ defaultConfigScript = 'dfconfig.cfg';
var
gConsoleShow: Boolean = false; // True - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ
gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
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_gui, g_language, g_net, g_netmsg, e_log, conbuf;
+ {$IFDEF ENABLE_MENU}
+ g_gui, g_menu,
+ {$ENDIF}
+ {$IFDEF ENABLE_TOUCH}
+ g_system,
+ {$ENDIF}
+ {$IFDEF ENABLE_GFX}
+ g_gfx,
+ {$ENDIF}
+ {$IFDEF ENABLE_GIBS}
+ g_gibs,
+ {$ENDIF}
+ g_textures, e_input, g_game, g_player, g_items,
+ SysUtils, g_basic, g_options, Math, e_res,
+ g_language, g_net, g_netmsg, e_log, conbuf;
+const
+ configComment = 'generated by doom2d, do not modify';
type
PCommand = ^TCommand;
MsgTime = 144;
MaxScriptRecursion = 16;
- DEBUG_STRING = 'DEBUG MODE';
-
var
- ID: DWORD;
RecursionDepth: Word = 0;
RecursionLimitHit: Boolean = False;
- Cons_Y: SmallInt;
- ConsoleHeight: Single;
- Cons_Shown: Boolean; // draw console
InputReady: Boolean; // allow text input in console/chat
- Line: AnsiString;
- CPos: Word;
//ConsoleHistory: SSArray;
CommandHistory: SSArray;
Whitelist: SSArray;
commands: Array of TCommand = nil;
Aliases: Array of TAlias = nil;
CmdIndex: Word;
- conSkipLines: Integer = 0;
- MsgArray: Array [0..4] of record
- Msg: AnsiString;
- Time: Word;
- end;
gInputBinds: Array [0..e_MaxInputKeys - 1] of record
+ rep: Boolean;
down, up: SSArray;
end;
- menu_toggled: BOOLEAN; (* hack for menu controls *)
- ChatTop: BOOLEAN;
- ConsoleStep: Single;
- ConsoleTrans: Single;
+ menu_toggled: BOOLEAN; (* hack for menu controls *)
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);
+ {$IFDEF ENABLE_TOUCH}
+ sys_ShowKeyboard(gConsoleShow or gChatShow);
+ {$ENDIF}
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);
+ {$IFDEF ENABLE_TOUCH}
+ sys_ShowKeyboard(gConsoleShow or gChatShow);
+ {$ENDIF}
end;
// poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
end;
+procedure wordVarHandler (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 := PWord(me.ptr)^;
+ PWord(me.ptr)^ := min($FFFF, StrToDWord(p[1]));
+ if PWord(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
+ except
+ 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;
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
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
'unbindall':
for i := 0 to e_MaxInputKeys - 1 do
g_Console_BindKey(i, '');
+{$IFDEF ENABLE_TOUCH}
'showkeyboard':
- g_Touch_ShowKeyboard(True);
+ sys_ShowKeyboard(True);
'hidekeyboard':
- g_Touch_ShowKeyboard(False);
+ sys_ShowKeyboard(False);
+{$ENDIF}
'togglemenu':
begin
if gConsoleShow then
else if gChatShow then
g_Console_Chat_Switch
else
+ begin
KeyPress(VK_ESCAPE);
+ end;
menu_toggled := True
end;
'toggleconsole':
end
end;
-procedure g_Console_Init();
- var
- a: Integer;
+procedure g_Console_Initialize;
+ var a: Integer;
begin
- g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
- Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
gConsoleShow := False;
gChatShow := False;
- Cons_Shown := False;
InputReady := False;
CPos := 1;
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('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_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('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_bot_vsmonsters', GameCVars);
AddCommand('g_bot_vsplayers', GameCVars);
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('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);
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);
+ g_Console_ReadConfig('autoexec.cfg');
+
gParsingBinds := False;
+end;
+procedure g_Console_Finalize;
+begin
+
+end;
+
+procedure g_Console_Init;
+begin
g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
g_Console_Add('');
end;
procedure g_Console_Update;
var
- a, b, Step: Integer;
+ a, b: Integer;
begin
- if Cons_Shown then
- begin
- Step := Max(1, Round(Floor(gScreenHeight * ConsoleHeight) * ConsoleStep));
- if gConsoleShow then
- begin
- (* Open animation *)
- Cons_Y := Min(Cons_Y + Step, 0);
- InputReady := True
- end
- else
- begin
- (* 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;
+ InputReady := gConsoleShow or gChatShow;
a := 0;
while a <= High(MsgArray) do
end;
end;
-
-procedure drawConsoleText ();
-var
- CWidth, CHeight: Byte;
- ty: Integer;
- sp, ep: LongWord;
- skip: Integer;
-
- procedure putLine (sp, ep: LongWord);
- var
- p: LongWord;
- wdt, cw: Integer;
- begin
- p := sp;
- wdt := 0;
- while p <> ep do
- begin
- cw := e_TextureFontCharWidth(cbufAt(p), gStdFont);
- if wdt+cw > gScreenWidth-8 then break;
- //e_TextureFontPrintChar(X, Y: Integer; Ch: Char; FontID: DWORD; Shadow: Boolean = False);
- Inc(wdt, cw);
- cbufNext(p);
- end;
- if p <> ep then putLine(p, ep); // do rest of the line first
- // now print our part
- if skip = 0 then
- begin
- ep := p;
- p := sp;
- wdt := 2;
- while p <> ep do
- begin
- cw := e_TextureFontCharWidth(cbufAt(p), gStdFont);
- e_TextureFontPrintCharEx(wdt, ty, cbufAt(p), gStdFont);
- Inc(wdt, cw);
- cbufNext(p);
- end;
- Dec(ty, CHeight);
- end
- else
- begin
- Dec(skip);
- end;
- end;
-
-begin
- e_TextureFontGetSize(gStdFont, CWidth, CHeight);
- ty := Floor(gScreenHeight * ConsoleHeight) - 4 - 2 * CHeight - Abs(Cons_Y);
- skip := conSkipLines;
- cbufLastLine(sp, ep);
- repeat
- putLine(sp, ep);
- if ty+CHeight <= 0 then break;
- until not cbufLineUp(sp, ep);
-end;
-
-procedure g_Console_Draw();
-var
- CWidth, CHeight: Byte;
- mfW, mfH: Word;
- 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, offset_y + CHeight * a, MsgArray[a].Msg, gStdFont, True);
-
- if gChatShow then
- begin
- if ChatTop then
- offset_y := 0
- else
- offset_y := gScreenHeight - CHeight - 1;
- if gChatTeam then
- begin
- 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 + (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, Round(ConsoleTrans * 255), False, False, gScreenWidth, Floor(gScreenHeight * ConsoleHeight));
- e_TextureFontPrint(0, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - CHeight - 4, '> ' + Line, gStdFont);
-
- drawConsoleText();
- (*
- if ConsoleHistory <> nil then
- begin
- b := 0;
- if CHeight > 0 then
- 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, 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 + Floor(gScreenHeight * ConsoleHeight) - 21, '_', gStdFont);
-end;
-
procedure g_Console_Char(C: AnsiChar);
begin
if InputReady and (gConsoleShow or gChatShow) then
IK_END, IK_KPEND:
CPos := Length(Line) + 1;
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_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
procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = '');
begin
- //e_LogWritefln('bind "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), cmd, key]);
+ // e_LogWritefln('bind "%s" "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), down, up, key]);
ASSERT(key >= 0);
ASSERT(key < e_MaxInputKeys);
if key > 0 then
begin
+ gInputBinds[key].rep := False;
gInputBinds[key].down := ParseAlias(down);
gInputBinds[key].up := ParseAlias(up);
end;
end;
function BindsAllowed (key: Integer): Boolean;
+ var grab, active: 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
+ {$IFDEF DISABLE_MENU}
+ grab := False;
+ active := False;
+ {$ELSE}
+ grab := g_GUIGrabInput;
+ active := g_ActiveWindow <> nil;
+ {$ENDIF}
+ if (not grab) 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
+ else if gConsoleShow or active 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
menu_toggled := False
end;
+procedure g_Console_ProcessBindRepeat (key: Integer);
+ var i: Integer; active: Boolean;
+begin
+ {$IFDEF DISABLE_MENU}
+ active := False;
+ {$ELSE}
+ active := g_ActiveWindow <> nil;
+ {$ENDIF}
+ if gConsoleShow or gChatShow or active 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
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
procedure g_Console_WriteConfig (filename: String);
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
+ // e_LogWritefln('g_Console_WriteConfig: %s', [filename]);
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
if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then
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
+ {$IFDEF ENABLE_GFX}
+ WriteLn(f, 'g_max_particles ', g_GFX_GetMax());
+ {$ENDIF}
+ WriteLn(f, 'g_max_shells ', g_Shells_GetMax());
+ {$IFDEF ENABLE_GIBS}
+ WriteLn(f, 'g_max_gibs ', g_Gibs_GetMax());
+ {$ENDIF}
+ 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_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));
+ 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));
+ end;
+
+ // all cvars
for i := 0 to High(commands) do
begin
if not commands[i].cheat then
begin
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)
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 then
- Exit;
- g_Console_WriteConfig(GameDir + '/dfconfig.cfg');
+ 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('d_eres', @debug_e_res, '', '');
+ for i := 1 to e_MaxJoys do
+ conRegVar('joy' + IntToStr(i) + '_deadzone', @e_JoystickDeadzones[i - 1], '', '')
end;
initialization
- 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;
+ Init
end.