X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=4141f27aeb4b6f66d7f2809559ec52fa42c7e184;hb=0f52924bd95347684a7635a9843802364b6d9712;hp=63454eb1cb52dbf1ad6b6014a971926559679f5b;hpb=2f4ef61a594006d1da7ec293ab72502d5d6ba241;p=d2df-sdl.git diff --git a/src/game/g_console.pas b/src/game/g_console.pas index 63454eb..4141f27 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -2,8 +2,7 @@ * * 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 @@ -38,8 +37,9 @@ uses 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); @@ -64,6 +64,7 @@ procedure conwritefln (const s: AnsiString; args: array of const; show: Boolean= 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; @@ -115,8 +116,6 @@ type const - Step = 32; - Alpha = 25; MsgTime = 144; MaxScriptRecursion = 16; @@ -128,7 +127,8 @@ var 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; @@ -147,28 +147,37 @@ var down, up: 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 @@ -274,6 +283,24 @@ begin 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; @@ -316,6 +343,26 @@ begin 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; @@ -722,12 +769,10 @@ begin '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; @@ -787,15 +832,14 @@ begin 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; Cons_Shown := False; + InputReady := False; CPos := 1; for a := 0 to High(MsgArray) do @@ -974,46 +1018,38 @@ begin g_Console_ReadConfig(GameDir + '/dfconfig.cfg'); g_Console_ReadConfig(GameDir + '/autoexec.cfg'); 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 - 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; @@ -1097,41 +1133,46 @@ begin 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); @@ -1141,7 +1182,7 @@ begin _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(); @@ -1170,8 +1211,11 @@ end; 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; @@ -1339,7 +1383,8 @@ begin Line := ''; CPos := 1; gJustChatted := True; - g_Console_Chat_Switch + g_Console_Chat_Switch; + InputReady := False; end; end; IK_TAB: @@ -1374,7 +1419,7 @@ begin 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 @@ -1892,6 +1937,13 @@ begin 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) @@ -1905,10 +1957,17 @@ begin 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} - ConsoleHeight := 0.35 + ChatTop := True; + ConsoleHeight := 0.35; {$ELSE} - ConsoleHeight := 0.5 + ChatTop := False; + ConsoleHeight := 0.5; {$ENDIF} + ConsoleTrans := 0.1; + ConsoleStep := 0.07; end.