X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame%2Fg_console.pas;h=5953403c7dd3aa4f4e714d7e1a99de1e927fb770;hb=683e1735a7efbf7342dec58a49d7f559a1e75fea;hp=033a46827d5a3312a6b062fa335d37446edc5038;hpb=6a9364772aa1d92cf10886b5d1cec54d557bcada;p=d2df-sdl.git

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 033a468..5953403 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -39,7 +39,7 @@ uses
 
 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);
@@ -115,8 +115,6 @@ type
 
 
 const
-  Step = 32;
-  Alpha = 25;
   MsgTime = 144;
   MaxScriptRecursion = 16;
 
@@ -128,8 +126,8 @@ var
   RecursionLimitHit: Boolean = False;
   Cons_Y: SmallInt;
   ConsoleHeight: Single;
-  Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü?
-  InputReady: Boolean;
+  Cons_Shown: Boolean; // draw console
+  InputReady: Boolean; // allow text input in console/chat
   Line: AnsiString;
   CPos: Word;
   //ConsoleHistory: SSArray;
@@ -149,10 +147,15 @@ var
   end;
   menu_toggled: BOOLEAN; (* hack for menu controls *)
   ChatTop: BOOLEAN;
+  ConsoleStep: Single;
+  ConsoleTrans: Single;
 
 
 procedure g_Console_Switch;
 begin
+  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;
@@ -163,6 +166,9 @@ end;
 procedure g_Console_Chat_Switch (Team: Boolean = False);
 begin
   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;
@@ -724,12 +730,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;
 
@@ -982,43 +986,29 @@ begin
   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
-    (* Open animation *)
-    if gConsoleShow and (Cons_Y < 0) then
-      Cons_Y := Cons_Y+Step;
-
-    (* Colse animation *)
-    if (not gConsoleShow) and (Cons_Y > -Floor(gScreenHeight * ConsoleHeight)) then
-      Cons_Y := Cons_Y-Step;
-
-    if gChatShow then
+    Step := Max(1, Round(Floor(gScreenHeight * ConsoleHeight) * ConsoleStep));
+    if gConsoleShow then
     begin
-      (* End open chat animation. Do not show console *)
-      Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
-      Cons_Shown := False;
-      InputReady := True;
+      (* Open animation *)
+      Cons_Y := Min(Cons_Y + Step, 0);
+      InputReady := True
     end
     else
-    if Cons_Y >= 0 then
     begin
-      (* End open animation *)
-      Cons_Y := 0;
-      Cons_Shown := True;
-      InputReady := True;
-    end
-    else
-    if Cons_Y <= -Floor(gScreenHeight * ConsoleHeight) then
-    begin
-      (* End close animation *)
-      Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
-      Cons_Shown := False;
-      InputReady := False;
+      (* Close animation *)
+      Cons_Y := Max(Cons_Y - Step, -Floor(gScreenHeight * ConsoleHeight));
+      Cons_Shown := Cons_Y > -Floor(gScreenHeight * ConsoleHeight);
+      InputReady := False
     end;
+
+    if gChatShow then
+      InputReady := True
   end;
 
   a := 0;
@@ -1102,7 +1092,7 @@ 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;
@@ -1119,6 +1109,8 @@ begin
     if MsgArray[a].Time > 0 then
       e_TextureFontPrintFmt(0, offset_y + CHeight * a, MsgArray[a].Msg, gStdFont, True);
 
+  if MessagesOnly then Exit;
+
   if gChatShow then
   begin
     if ChatTop then
@@ -1149,7 +1141,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();
@@ -1919,11 +1911,15 @@ 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}
   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.