X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=88b229aa220b888697903da121c21f01e0bbe0f4;hb=683e1735a7efbf7342dec58a49d7f559a1e75fea;hp=95e2c4ddc0844d228cde4ed1397c4bc6cc38c6c2;hpb=04f1e58db9ef9dd87bb4a829d000b02da0304c3b;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 95e2c4d..88b229a 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -515,7 +515,7 @@ begin
           e_KeyUpDown(key, down);
           g_Console_ProcessBind(key, down);
         end
-        else if gConsoleShow or (g_ActiveWindow <> nil) then
+        else if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
         begin
           // key repeat in menus and shit
           KeyPress(key);
@@ -789,7 +789,6 @@ var
 procedure ProcessLoading (forceUpdate: Boolean=false);
 var
   ev: TSDL_Event;
-  ID: LongWord;
   stt: UInt64;
 begin
   FillChar(ev, sizeof(ev), 0);
@@ -826,17 +825,11 @@ begin
 
     if forceUpdate then
     begin
-      if g_Texture_Get('INTER', ID) then
-      begin
-        e_DrawSize(ID, 0, 0, 0, false, false, gScreenWidth, gScreenHeight);
-        e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-      end
-      else
-      begin
-        e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
-      end;
+      DrawMenuBackground('INTER');
+      e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
 
       DrawLoadingStat();
+      g_Console_Draw(True);
       SwapBuffers();
     end;
   end;
@@ -974,7 +967,7 @@ begin
   {$IFDEF USE_GLES1}
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
-    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);    
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
   {$ELSE}
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);