diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 6022ee6d9c7a929f6afe6adcf615a4496959265c..2b4fe158d53daa2ced428c06cd0449bad647e51d 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_panel in 'opengl/r_panel.pas',
r_player in 'opengl/r_player.pas',
r_playermodel in 'opengl/r_playermodel.pas',
r_panel in 'opengl/r_panel.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',
UseNativeMusic: Boolean;
{$ENDIF}
UseNativeMusic: Boolean;
{$ENDIF}
- 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 ();
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;
{$IFDEF ENABLE_HOLMES}
InitHolmes;
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
InitHolmes;
{$ENDIF}
+ 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}