X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=7d953860e9dc7ff6007611e9b3ac3121e0b3ec9e;hb=a7b5840560ba63bca3b9fc7f7608fffa8c0b0e41;hp=c6a43bb1e6848f0be62393bae1bc3a6de6969830;hpb=4c6bb5a1347f606d9f87b66e0e020a89a10648cb;p=d2df-sdl.git diff --git a/src/game/g_console.pas b/src/game/g_console.pas index c6a43bb..7d95386 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -129,6 +129,7 @@ var Cons_Y: SmallInt; ConsoleHeight: Single; Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü? + InputReady: Boolean; Line: AnsiString; CPos: Word; //ConsoleHistory: SSArray; @@ -147,6 +148,7 @@ var down, up: SSArray; end; menu_toggled: BOOLEAN; (* hack for menu controls *) + ChatTop: BOOLEAN; procedure g_Console_Switch; @@ -154,6 +156,7 @@ begin gChatShow := False; gConsoleShow := not gConsoleShow; Cons_Shown := True; + InputReady := False; g_Touch_ShowKeyboard(gConsoleShow or gChatShow); end; @@ -163,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); @@ -707,14 +712,13 @@ 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': @@ -794,6 +798,7 @@ begin gConsoleShow := False; gChatShow := False; Cons_Shown := False; + InputReady := False; CPos := 1; for a := 0 to High(MsgArray) do @@ -983,25 +988,38 @@ var begin if Cons_Shown then begin - //  ïðîöåññå îòêðûòèÿ: + (* Open animation *) if gConsoleShow and (Cons_Y < 0) then - begin Cons_Y := Cons_Y+Step; - end; - //  ïðîöåññå çàêðûòèÿ: + (* Colse animation *) if (not gConsoleShow) and (Cons_Y > -Floor(gScreenHeight * ConsoleHeight)) then Cons_Y := Cons_Y-Step; - // Îêîí÷àòåëüíî îòêðûëàñü: + if gChatShow then + begin + (* End open chat animation. Do not show console *) + Cons_Y := -Floor(gScreenHeight * ConsoleHeight); + Cons_Shown := True; + InputReady := True; +// g_Touch_ShowKeyboard(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); end; end; @@ -1090,37 +1108,40 @@ 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); @@ -1159,8 +1180,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; @@ -1300,7 +1324,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 @@ -1327,9 +1351,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: @@ -1367,17 +1391,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 gConsoleShow and not Cons_Shown 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 and not Cons_Shown then - g_Console_Switch - end end end; @@ -1713,17 +1726,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) @@ -1890,10 +1919,13 @@ 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'); {$IFDEF ANDROID} + ChatTop := True; ConsoleHeight := 0.35 {$ELSE} + ChatTop := False; ConsoleHeight := 0.5 {$ENDIF} end.