X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=033a46827d5a3312a6b062fa335d37446edc5038;hp=b5e771091280eeaaa43be238aedaea15d8b7b72c;hb=6a9364772aa1d92cf10886b5d1cec54d557bcada;hpb=e6b669503304e196d3337cbe236fbfcbfff9b5a1 diff --git a/src/game/g_console.pas b/src/game/g_console.pas index b5e7710..033a468 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -48,6 +48,7 @@ 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; @@ -77,6 +78,7 @@ var gChatTeam: Boolean = false; gAllowConsoleMessages: Boolean = true; gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó + gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action] implementation @@ -125,7 +127,9 @@ var RecursionDepth: Word = 0; RecursionLimitHit: Boolean = False; Cons_Y: SmallInt; + ConsoleHeight: Single; Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü? + InputReady: Boolean; Line: AnsiString; CPos: Word; //ConsoleHistory: SSArray; @@ -144,7 +148,7 @@ var down, up: SSArray; end; menu_toggled: BOOLEAN; (* hack for menu controls *) - gSkipFirstChar: Boolean; (* hack for console/chat input *) + ChatTop: BOOLEAN; procedure g_Console_Switch; @@ -152,6 +156,7 @@ begin gChatShow := False; gConsoleShow := not gConsoleShow; Cons_Shown := True; + InputReady := False; g_Touch_ShowKeyboard(gConsoleShow or gChatShow); end; @@ -161,6 +166,8 @@ begin gConsoleShow := False; gChatShow := not gChatShow; gChatTeam := Team; + Cons_Shown := True; + InputReady := False; Line := ''; CPos := 1; g_Touch_ShowKeyboard(gConsoleShow or gChatShow); @@ -220,6 +227,8 @@ end; procedure boolVarHandler (me: PCommand; p: SSArray); procedure binaryFlag (var flag: Boolean; msg: AnsiString); + var + old: Boolean; begin if (Length(p) > 2) then begin @@ -227,12 +236,15 @@ procedure boolVarHandler (me: PCommand; p: SSArray); 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; @@ -243,24 +255,8 @@ end; procedure intVarHandler (me: PCommand; p: SSArray); - procedure binaryFlag (var flag: Boolean; msg: AnsiString); - 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]); - end; - end; +var + old: Integer; begin if (Length(p) <> 2) then begin @@ -269,7 +265,10 @@ begin 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; @@ -331,7 +330,7 @@ type procedure singleVarHandler (me: PCommand; p: SSArray); var pv: PVarSingle; - nv: Single; + nv, old: Single; msg: AnsiString; begin if (Length(p) > 2) then @@ -340,6 +339,7 @@ begin 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; @@ -361,6 +361,8 @@ begin 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^]); @@ -648,6 +650,14 @@ begin 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: AnsiString; i: Integer; begin @@ -663,7 +673,7 @@ begin if i < e_MaxInputKeys then begin if Length(p) = 2 then - g_Console_Add('"' + e_KeyNames[i] + '" = "' + GetCommandString(gInputBinds[i].down) + '" "' + GetCommandString(gInputBinds[i].up) + '"') + 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 *) @@ -679,7 +689,7 @@ begin '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] + ' "' + GetCommandString(gInputBinds[i].down) + '" "' + GetCommandString(gInputBinds[i].up) + '"'); + g_Console_Add(e_KeyNames[i] + ' ' + QuoteStr(GetCommandString(gInputBinds[i].down)) + ' ' + QuoteStr(GetCommandString(gInputBinds[i].up))); 'unbind': // unbind if Length(p) = 2 then @@ -702,34 +712,24 @@ begin 'hidekeyboard': g_Touch_ShowKeyboard(False); 'togglemenu': - if gConsoleShow then - begin - g_Console_Switch; - menu_toggled := True - end - else begin - KeyPress(VK_ESCAPE); + if gConsoleShow then + g_Console_Switch + else if gChatShow then + g_Console_Chat_Switch + else + KeyPress(VK_ESCAPE); menu_toggled := True end; 'toggleconsole': - begin - g_Console_Switch; - gSkipFirstChar := g_Console_Interactive(); - end; + g_Console_Switch; 'togglechat': - begin - if not gConsoleShow and (g_ActiveWindow = nil) then - g_Console_Chat_Switch; - gSkipFirstChar := not g_Console_Interactive() - end; + if not gConsoleShow and (g_ActiveWindow = nil) then + g_Console_Chat_Switch; 'toggleteamchat': if gGameSettings.GameMode in [GM_TDM, GM_CTF] then - begin if not gConsoleShow and (g_ActiveWindow = nil) then g_Console_Chat_Switch(True); - gSkipFirstChar := not g_Console_Interactive() - end; end end; @@ -794,10 +794,11 @@ procedure g_Console_Init(); 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 @@ -975,6 +976,7 @@ begin g_Console_ResetBinds; g_Console_ReadConfig(GameDir + '/dfconfig.cfg'); g_Console_ReadConfig(GameDir + '/autoexec.cfg'); + gParsingBinds := False; g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION])); g_Console_Add(''); @@ -986,26 +988,36 @@ var begin if Cons_Shown then begin - //  ïðîöåññå îòêðûòèÿ: + (* Open animation *) if gConsoleShow and (Cons_Y < 0) then - begin Cons_Y := Cons_Y+Step; - end; - //  ïðîöåññå çàêðûòèÿ: - if (not gConsoleShow) and - (Cons_Y > -(gScreenHeight div 2)) then + (* Colse animation *) + if (not gConsoleShow) and (Cons_Y > -Floor(gScreenHeight * ConsoleHeight)) then Cons_Y := Cons_Y-Step; - // Îêîí÷àòåëüíî îòêðûëàñü: - if Cons_Y > 0 then + if gChatShow then + begin + (* End open chat animation. Do not show console *) + Cons_Y := -Floor(gScreenHeight * ConsoleHeight); + Cons_Shown := False; + InputReady := True; + end + else + if Cons_Y >= 0 then + begin + (* End open animation *) Cons_Y := 0; - - // Îêîí÷àòåëüíî çàêðûëàñü: - if Cons_Y <= (-(gScreenHeight div 2)) then + Cons_Shown := True; + InputReady := True; + end + else + if Cons_Y <= -Floor(gScreenHeight * ConsoleHeight) then begin - Cons_Y := -(gScreenHeight div 2); + (* End close animation *) + Cons_Y := -Floor(gScreenHeight * ConsoleHeight); Cons_Shown := False; + InputReady := False; end; end; @@ -1081,7 +1093,7 @@ var 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 @@ -1094,48 +1106,51 @@ procedure g_Console_Draw(); 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 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, Alpha, False, False, gScreenWidth, Floor(gScreenHeight * ConsoleHeight)); + e_TextureFontPrint(0, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - CHeight - 4, '> ' + Line, gStdFont); drawConsoleText(); (* @@ -1143,8 +1158,8 @@ begin 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); @@ -1152,24 +1167,22 @@ begin 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); + e_TextureFontPrint((CPos + 1) * CWidth, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - 21, '_', gStdFont); end; procedure g_Console_Char(C: AnsiChar); begin - if not gSkipFirstChar then + if InputReady and (gConsoleShow or gChatShow) then begin Insert(C, Line, CPos); CPos := CPos + 1; - end; - gSkipFirstChar := False + end end; @@ -1309,7 +1322,7 @@ begin CPos := CPos + 1; 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 @@ -1336,9 +1349,9 @@ begin Line := ''; CPos := 1; - gChatShow := False; gJustChatted := True; - g_Touch_ShowKeyboard(gConsoleShow or gChatShow); + g_Console_Chat_Switch; + InputReady := False; end; end; IK_TAB: @@ -1376,21 +1389,6 @@ begin 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 *) - else - if not gSkipFirstChar then - begin - if gConsoleShow and g_Console_MatchBind(K, 'toggleconsole') then - g_Console_Switch; - - if g_Console_MatchBind(K, 'togglemenu') then - begin - menu_toggled := True; - if gChatShow then - g_Console_Chat_Switch - else if gConsoleShow then - g_Console_Switch - end - end end end; @@ -1668,8 +1666,9 @@ begin if key > 0 then begin gInputBinds[key].down := ParseAlias(down); - gInputBinds[key].up := ParseAlias(up) - end + gInputBinds[key].up := ParseAlias(up); + end; + g_Console_WriteGameConfig(); end; function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean; @@ -1725,17 +1724,33 @@ begin 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 g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then + if BindsAllowed(key) then begin if down then - begin - if not gChatShow then - for i := 0 to High(gInputBinds[key].down) do - g_Console_Process(gInputBinds[key].down[i], True); - end + 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) @@ -1848,10 +1863,10 @@ begin 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; @@ -1864,7 +1879,14 @@ begin WriteLn(f, 'unbindall'); for i := 0 to e_MaxInputKeys - 1 do if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then - WriteLn(f, 'bind ', e_KeyNames[i], ' "', GetCommandString(gInputBinds[i].down), '" "', GetCommandString(gInputBinds[i].up), '"'); + begin + 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, ''); + end; for i := 0 to High(commands) do begin if not commands[i].cheat then @@ -1872,20 +1894,36 @@ begin 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 = @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 end end; CloseFile(f) end; +procedure g_Console_WriteGameConfig; +begin + if gParsingBinds then + Exit; + g_Console_WriteConfig(GameDir + '/dfconfig.cfg'); +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'); +{$IFDEF ANDROID} + ChatTop := True; + ConsoleHeight := 0.35 +{$ELSE} + ChatTop := False; + ConsoleHeight := 0.5 +{$ENDIF} end.