diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 7d953860e9dc7ff6007611e9b3ac3121e0b3ec9e..fb76d519dfcef27660f37db6336f21f7fef7029c 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
LAST_ACTION = ACTION_WEAPPREV;
procedure g_Console_Init;
+procedure g_Console_SysInit;
procedure g_Console_Update;
-procedure g_Console_Draw;
+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 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: 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;
uses
g_textures, g_main, e_graphics, e_input, g_game,
- SysUtils, g_basic, g_options, Math, g_touch,
+ SysUtils, g_basic, g_options, Math, g_touch, e_res,
g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf;
+const
+ configScript = 'dfconfig.cfg';
+ autoexecScript = 'autoexec.cfg';
+ configComment = 'generated by doom2d, do not modify';
type
PCommand = ^TCommand;
const
- Step = 32;
- Alpha = 25;
MsgTime = 144;
MaxScriptRecursion = 16;
RecursionLimitHit: Boolean = False;
Cons_Y: SmallInt;
ConsoleHeight: Single;
- Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü?
- InputReady: Boolean;
+ Cons_Shown: Boolean; // draw console
+ InputReady: Boolean; // allow text input in console/chat
Line: AnsiString;
CPos: Word;
//ConsoleHistory: 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;
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;
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: 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
'toggleconsole':
g_Console_Switch;
'togglechat':
- if not gConsoleShow and (g_ActiveWindow = nil) then
- g_Console_Chat_Switch;
+ g_Console_Chat_Switch;
'toggleteamchat':
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
- if not gConsoleShow and (g_ActiveWindow = nil) then
- g_Console_Chat_Switch(True);
+ 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 := -Floor(gScreenHeight * ConsoleHeight);
gConsoleShow := False;
gChatShow := False;
WhitelistCommand('g_timelimit');
g_Console_ResetBinds;
- g_Console_ReadConfig(GameDir + '/dfconfig.cfg');
- g_Console_ReadConfig(GameDir + '/autoexec.cfg');
+ g_Console_ReadConfig(configScript);
+ 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
- (* Open animation *)
- if gConsoleShow and (Cons_Y < 0) then
- Cons_Y := Cons_Y+Step;
-
- (* Colse animation *)
- if (not gConsoleShow) and (Cons_Y > -Floor(gScreenHeight * ConsoleHeight)) then
- Cons_Y := Cons_Y-Step;
-
- if gChatShow then
+ Step := Max(1, Round(Floor(gScreenHeight * ConsoleHeight) * ConsoleStep));
+ if gConsoleShow then
begin
- (* End open chat animation. Do not show console *)
- Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
- Cons_Shown := True;
- InputReady := True;
-// g_Touch_ShowKeyboard(True);
+ (* Open animation *)
+ Cons_Y := Min(Cons_Y + Step, 0);
+ InputReady := True
end
else
- if Cons_Y > 0 then
begin
- (* End open animation *)
- Cons_Y := 0;
- InputReady := True;
-// g_Touch_ShowKeyboard(True);
- end
- else
- if Cons_Y <= -Floor(gScreenHeight * ConsoleHeight) then
- begin
- (* End close animation *)
- Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
- Cons_Shown := False;
- InputReady := False;
-// g_Touch_ShowKeyboard(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;
until not cbufLineUp(sp, ep);
end;
-procedure g_Console_Draw();
+procedure g_Console_Draw(MessagesOnly: Boolean = False);
var
CWidth, CHeight: Byte;
mfW, mfH: Word;
if MsgArray[a].Time > 0 then
e_TextureFontPrintFmt(0, offset_y + CHeight * a, MsgArray[a].Msg, gStdFont, True);
+ if MessagesOnly then Exit;
+
if gChatShow then
begin
if ChatTop then
_RGB(128, 0, 0), 2.0);
end;
- e_DrawSize(ID, 0, Cons_Y, Alpha, False, False, gScreenWidth, Floor(gScreenHeight * ConsoleHeight));
+ 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();
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_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
begin
AssignFile(f, filename);
Rewrite(f);
- WriteLn(f, '// generated by doom2d, do not modify');
+ WriteLn(f, '// ' + configComment);
WriteLn(f, 'unbindall');
for i := 0 to e_MaxInputKeys - 1 do
if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) 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;
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, configScript))
+ end
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
+ ConsoleHeight := 0.35;
{$ELSE}
ChatTop := False;
- ConsoleHeight := 0.5
+ ConsoleHeight := 0.5;
{$ENDIF}
+ ConsoleTrans := 0.1;
+ ConsoleStep := 0.07;
end.