diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 268e281a029f8e05fefb378a13db5d7fd20b6117..400e77701cc60a5b8e8980913526939a8bfc8644 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
g_touch in 'sdl2/g_touch.pas',
{$ENDIF}
g_touch in 'sdl2/g_touch.pas',
{$ENDIF}
+ r_animations in 'opengl/r_animations.pas',
r_console in 'opengl/r_console.pas',
r_game in 'opengl/r_game.pas',
r_gfx in 'opengl/r_gfx.pas',
r_console in 'opengl/r_console.pas',
r_game in 'opengl/r_game.pas',
r_gfx in 'opengl/r_gfx.pas',
r_map in 'opengl/r_map.pas',
r_monsters in 'opengl/r_monsters.pas',
r_netmaster in 'opengl/r_netmaster.pas',
r_map in 'opengl/r_map.pas',
r_monsters in 'opengl/r_monsters.pas',
r_netmaster in 'opengl/r_netmaster.pas',
- r_panel in 'opengl/r_panel.pas',
r_player in 'opengl/r_player.pas',
r_playermodel in 'opengl/r_playermodel.pas',
r_player in 'opengl/r_player.pas',
r_playermodel in 'opengl/r_playermodel.pas',
+ r_render in 'opengl/r_render.pas',
r_texture in 'opengl/r_texture.pas',
r_texture in 'opengl/r_texture.pas',
+ r_textures in 'opengl/r_textures.pas',
r_weapons in 'opengl/r_weapons.pas',
r_window in 'opengl/r_window.pas',
r_weapons in 'opengl/r_weapons.pas',
r_window in 'opengl/r_window.pas',
- r_render in 'opengl/r_render.pas',
{$IFDEF USE_FMOD}
fmod in '../lib/FMOD/fmod.pas',
{$IFDEF USE_FMOD}
fmod in '../lib/FMOD/fmod.pas',
binPath: AnsiString = '';
forceBinDir: Boolean = False;
binPath: AnsiString = '';
forceBinDir: Boolean = False;
- wLoadingQuit: Boolean = false;
- Time, Time_Delta, Time_Old: Int64;
- Frame: Int64;
- flag: Boolean = false;
-
+ Time_Old: Int64;
NoSound: Boolean;
procedure Update ();
NoSound: Boolean;
procedure Update ();
if (NetMode = NET_SERVER) then g_Net_Host_Update()
else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
// think
if (NetMode = NET_SERVER) then g_Net_Host_Update()
else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
// think
+ r_Render_Update;
g_Game_Update();
// server: send any accumulated outgoing data to clients
if NetMode = NET_SERVER then g_Net_Flush();
g_Game_Update();
// server: send any accumulated outgoing data to clients
if NetMode = NET_SERVER then g_Net_Flush();
function ProcessMessage (): Boolean;
var
i, t: Integer;
function ProcessMessage (): Boolean;
var
i, t: Integer;
+ flag: Boolean;
+ Time, Time_Delta: Int64;
+ Frame: Int64;
begin
result := sys_HandleInput();
begin
result := sys_HandleInput();
- Time := sys_GetTicks();
+ Time := GetTickCount64();
Time_Delta := Time-Time_Old;
flag := false;
Time_Delta := Time-Time_Old;
flag := false;
g_Map_ProfilersEnd();
g_Mons_ProfilersEnd();
g_Map_ProfilersEnd();
g_Mons_ProfilersEnd();
- if wLoadingQuit then
- begin
- g_Game_Free();
- g_Game_Quit();
- end;
-
if (gExit = EXIT_QUIT) then
begin
result := true;
if (gExit = EXIT_QUIT) then
begin
result := true;
Frame := Time
end
else
Frame := Time
end
else
- sys_Delay(1);
+ Sleep(1);
e_SoundUpdate();
end;
e_SoundUpdate();
end;
end;
{$ENDIF}
end;
{$ENDIF}
+ procedure ScreenResize (w, h: Integer);
+ begin
+ r_Render_Resize(w, h);
+ {$IFDEF ENABLE_HOLMES}
+ fuiScrWdt := w;
+ fuiScrHgt := h;
+ {$ENDIF}
+ g_Game_SetupScreenSize;
+ {$IFNDEF ANDROID}
+ (* This will fix menu reset on keyboard showing *)
+ g_Menu_Reset;
+ {$ENDIF}
+ //g_Game_ClearLoading;
+ {$IFDEF ENABLE_HOLMES}
+ if assigned(oglInitCB) then oglInitCB;
+ {$ENDIF}
+ end;
+
procedure Startup;
begin
Randomize;
procedure Startup;
begin
Randomize;
e_InitSoundSystem(NoSound);
sys_Init;
sys_CharPress := @CharPress; (* install hook *)
e_InitSoundSystem(NoSound);
sys_Init;
sys_CharPress := @CharPress; (* install hook *)
+ sys_ScreenResize := @ScreenResize; (* install hook *)
g_Options_SetDefault;
g_Options_SetDefaultVideo;
g_Console_Initialize;
g_Options_SetDefault;
g_Options_SetDefaultVideo;
g_Console_Initialize;
{$IFDEF ENABLE_HOLMES}
InitHolmes;
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
InitHolmes;
{$ENDIF}
+ g_PlayerModel_LoadAll;
+ r_Render_Load;
g_Game_Init;
{$IFNDEF HEADLESS}
g_Menu_Init;
g_Game_Init;
{$IFNDEF HEADLESS}
g_Menu_Init;
if (not gGameOn) and gAskLanguage then
g_Menu_AskLanguage;
{$ENDIF}
if (not gGameOn) and gAskLanguage then
g_Menu_AskLanguage;
{$ENDIF}
- Time_Old := sys_GetTicks();
+ Time_Old := GetTickCount64();
while not ProcessMessage() do begin end;
g_Console_WriteGameConfig;
{$IFNDEF HEADLESS}
g_GUI_Destroy;
g_Menu_Free;
{$ENDIF}
while not ProcessMessage() do begin end;
g_Console_WriteGameConfig;
{$IFNDEF HEADLESS}
g_GUI_Destroy;
g_Menu_Free;
{$ENDIF}
+ r_Render_Free;
{$IFDEF ENABLE_HOLMES}
FreeHolmes;
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
FreeHolmes;
{$ENDIF}