X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=c6a43bb1e6848f0be62393bae1bc3a6de6969830;hb=4c6bb5a1347f606d9f87b66e0e020a89a10648cb;hp=edf484f1dd8177dc59170710d0c48c6f4efeffb7;hpb=bccf523c0320f1f8f33edb72caec0a67cfa2e422;p=d2df-sdl.git

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index edf484f..c6a43bb 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -127,6 +127,7 @@ var
   RecursionDepth: Word = 0;
   RecursionLimitHit: Boolean = False;
   Cons_Y: SmallInt;
+  ConsoleHeight: Single;
   Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü?
   Line: AnsiString;
   CPos: Word;
@@ -146,7 +147,6 @@ var
     down, up: SSArray;
   end;
   menu_toggled: BOOLEAN; (* hack for menu controls *)
-  gSkipFirstChar: Boolean; (* hack for console/chat input *)
 
 
 procedure g_Console_Switch;
@@ -718,23 +718,14 @@ begin
       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;
 
@@ -799,7 +790,7 @@ 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;
@@ -999,8 +990,7 @@ begin
     end;
 
   // Â ïðîöåññå çàêðûòèÿ:
-    if (not gConsoleShow) and
-       (Cons_Y > -(gScreenHeight div 2)) then
+    if (not gConsoleShow) and (Cons_Y > -Floor(gScreenHeight * ConsoleHeight)) then
       Cons_Y := Cons_Y-Step;
 
   // Îêîí÷àòåëüíî îòêðûëàñü:
@@ -1008,9 +998,9 @@ begin
       Cons_Y := 0;
 
   // Îêîí÷àòåëüíî çàêðûëàñü:
-    if Cons_Y <= (-(gScreenHeight div 2)) then
+    if Cons_Y <= -Floor(gScreenHeight * ConsoleHeight) then
     begin
-      Cons_Y := -(gScreenHeight div 2);
+      Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
       Cons_Shown := False;
     end;
   end;
@@ -1087,7 +1077,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
@@ -1135,13 +1125,13 @@ begin
   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();
   (*
@@ -1149,8 +1139,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);
@@ -1158,24 +1148,19 @@ 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
-  begin
-    Insert(C, Line, CPos);
-    CPos := CPos + 1;
-  end;
-  gSkipFirstChar := False
+  Insert(C, Line, CPos);
+  CPos := CPos + 1;
 end;
 
 
@@ -1383,19 +1368,15 @@ begin
     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
+    if gConsoleShow and not Cons_Shown and g_Console_MatchBind(K, 'toggleconsole') then
+      g_Console_Switch;
+    if g_Console_MatchBind(K, 'togglemenu') 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
+      menu_toggled := True;
+      if gChatShow then
+        g_Console_Chat_Switch
+      else if gConsoleShow and not Cons_Shown then
+        g_Console_Switch
     end
   end
 end;
@@ -1908,4 +1889,11 @@ begin
   g_Console_WriteConfig(GameDir + '/dfconfig.cfg');
 end;
 
+initialization
+  conRegVar('console_height', @ConsoleHeight, 0.0, 1.0, 'set console size', 'set console size');
+{$IFDEF ANDROID}
+  ConsoleHeight := 0.35
+{$ELSE}
+  ConsoleHeight := 0.5
+{$ENDIF}
 end.