diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 3f3fd8ec2c998132439d1c30cfc78e3a35b701e7..b7c30dea57f6bca2b12ac4df0f3ad21e2b5e2936 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
procedure g_Console_Init;
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;
const
- Step = 32;
- Alpha = 25;
MsgTime = 144;
MaxScriptRecursion = 16;
RecursionLimitHit: Boolean = False;
Cons_Y: SmallInt;
ConsoleHeight: Single;
- Cons_Shown: 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
- if gConsoleShow or Cons_Shown or gChatShow then
- g_Touch_ShowKeyboard(False);
+ 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 gConsoleShow or Cons_Shown or gChatShow then
- g_Touch_ShowKeyboard(False);
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
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;
'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;
gConsoleShow := False;
gChatShow := False;
Cons_Shown := False;
+ InputReady := False;
CPos := 1;
for a := 0 to High(MsgArray) do
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
- Cons_Y := Cons_Y+Step;
-
- // Â ïðîöåññå çàêðûòèÿ:
- if (not gConsoleShow) and (Cons_Y > -Floor(gScreenHeight * ConsoleHeight)) then
- Cons_Y := Cons_Y-Step;
-
- // Open chat
- if gChatShow then
+ Step := Max(1, Round(Floor(gScreenHeight * ConsoleHeight) * ConsoleStep));
+ if gConsoleShow then
begin
- Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
- Cons_Shown := False;
- g_Touch_ShowKeyboard(True);
- end;
-
- // Îêîí÷àòåëüíî îòêðûëàñü:
- if Cons_Y > 0 then
+ (* Open animation *)
+ Cons_Y := Min(Cons_Y + Step, 0);
+ InputReady := True
+ end
+ else
begin
- Cons_Y := 0;
- g_Touch_ShowKeyboard(True);
+ (* Close animation *)
+ Cons_Y := Max(Cons_Y - Step, -Floor(gScreenHeight * ConsoleHeight));
+ Cons_Shown := Cons_Y > -Floor(gScreenHeight * ConsoleHeight);
+ InputReady := False
end;
- // Îêîí÷àòåëüíî çàêðûëàñü:
- if Cons_Y <= -Floor(gScreenHeight * ConsoleHeight) then
- begin
- Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
- Cons_Shown := 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 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 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;
- 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);
_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();
procedure g_Console_Char(C: AnsiChar);
begin
- Insert(C, Line, CPos);
- CPos := CPos + 1;
+ if InputReady and (gConsoleShow or gChatShow) then
+ begin
+ Insert(C, Line, CPos);
+ CPos := CPos + 1;
+ end
end;
Line := '';
CPos := 1;
gJustChatted := True;
- g_Console_Chat_Switch
+ g_Console_Chat_Switch;
+ InputReady := False;
end;
end;
IK_TAB:
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)
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.