diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 50fccd40a095fc55d7e64c5f7b73d80b2c3c94b5..b8d0921b589b98eb4190e598cd1f8ea32766a41f 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
g_console, e_input, g_options, g_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
g_map, g_gfx, g_monsters, xprofiler,
- g_touch;
+ g_touch, g_gui;
const
if g_dbg_input then
e_LogWritefln('Input Debug: keysym, press=%s, scancode=%s', [down, key]);
e_KeyUpDown(key, down);
- g_Console_ProcessBind(key, down)
+ g_Console_ProcessBind(key, down);
+ end
+ else if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
+ begin
+ // key repeat in menus and shit
+ KeyPress(key);
end;
- if down then KeyPress(key);
end;
SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP:
e_LogWritefln('Input Debug: jbutton, joy=%s, button=%s, keycode=%s, press=%s', [ev.jbutton.which, ev.jbutton.button, key, down]);
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
- if down then KeyPress(key)
end
else
begin
end;
e_KeyUpDown(minuskey, True);
g_Console_ProcessBind(minuskey, True);
- KeyPress(minuskey);
end
else if ev.jaxis.value > JoystickZeroAxes[ev.jaxis.which, ev.jaxis.axis] + e_JoystickDeadzones[ev.jaxis.which] then
begin
end;
e_KeyUpDown(key, True);
g_Console_ProcessBind(key, True);
- KeyPress(key);
end
else
begin
key := e_JoyHatToKey(ev.jhat.which, ev.jhat.hat, i);
e_KeyUpDown(key, down);
g_Console_ProcessBind(key, down);
- if down then KeyPress(key)
end
end;
JoystickHatState[ev.jhat.which, ev.jhat.hat] := hat
procedure ProcessLoading (forceUpdate: Boolean=false);
var
ev: TSDL_Event;
- ID: LongWord;
stt: UInt64;
begin
FillChar(ev, sizeof(ev), 0);
end;
end;
+{$IFNDEF HEADLESS}
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;
+{$ENDIF}
end;
e_SoundUpdate();
else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
end;
+ if NetMode = NET_SERVER then g_Net_Flush();
+
g_Map_ProfilersEnd();
g_Mons_ProfilersEnd();
{$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);
// Êîìàíäíàÿ ñòðîêà
if (ParamCount > 0) then g_Game_Process_Params();
+{$IFNDEF HEADLESS}
// Çàïðîñ ÿçûêà
if (not gGameOn) and gAskLanguage then g_Menu_AskLanguage();
+{$ENDIF}
e_WriteLog('Entering the main loop', TMsgType.Notify);