X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=29f79e480c403d6e6779e61f2a87f72a71fed84d;hb=ac201b02f10ef558087d50f6b03b4519ab567558;hp=ef1d362bd77362b5d5045ea3ffcea44b9ed24da7;hpb=3bedb8ac6ca3fe3a45921bb840b7b6be3171d6a9;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index ef1d362..29f79e4 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -1,9 +1,10 @@
+{$MODE DELPHI}
 unit g_window;
 
 interface
 
 uses
-  WADEDITOR;
+  wadreader;
 
 function  SDLMain(): Integer;
 function  GetTimer(): Int64;
@@ -23,6 +24,7 @@ function  g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean;
 implementation
 
 uses
+{$IFDEF WINDOWS}Windows,{$ENDIF}
   SDL2, GL, GLExt, e_graphics, e_log, g_main,
   g_console, SysUtils, e_input, g_options, g_game,
   g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net;
@@ -42,6 +44,8 @@ var
   wLoadingProgress: Boolean = False;
   wLoadingQuit: Boolean = False;
   {wWinPause: Byte = 0;}
+  ticksOverflow: Int64 = -1;
+  lastTicks: Uint32 = 0; // to detect overflow
 
 const
   // TODO: move this to a separate file
@@ -71,6 +75,11 @@ function g_Window_SetDisplay(PreserveGL: Boolean = False): Boolean;
 var
   mode, cmode: TSDL_DisplayMode;
 begin
+{$IFDEF HEADLESS}
+  Result := True;
+  Exit;
+{$ENDIF}
+
   Result := False;
 
   e_WriteLog('Setting display mode...', MSG_NOTIFY);
@@ -78,13 +87,13 @@ begin
   wFlags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE;
   if gFullscreen then wFlags := wFlags or SDL_WINDOW_FULLSCREEN;
   if gWinMaximized then wFlags := wFlags or SDL_WINDOW_MAXIMIZED;
-  
+
   if h_Wnd <> nil then
   begin
     SDL_DestroyWindow(h_Wnd);
     h_Wnd := nil;
   end;
-  
+
   if gFullscreen then
   begin
     mode.w := gScreenWidth;
@@ -106,7 +115,7 @@ begin
 
   h_Wnd := SDL_CreateWindow(PChar(wTitle), gWinRealPosX, gWinRealPosY, gScreenWidth, gScreenHeight, wFlags);
   if h_Wnd = nil then Exit;
-  
+
   SDL_GL_MakeCurrent(h_Wnd, h_GL);
   SDL_ShowCursor(SDL_DISABLE);
 
@@ -124,7 +133,7 @@ var
   res, i, k, n, pw, ph: Integer;
 begin
   SetLength(Result, 0);
-
+  {$IFDEF HEADLESS}Exit;{$ENDIF}
   k := 0; SelRes := 0;
   n := SDL_GetNumDisplayModes(0);
   pw := 0; ph := 0;
@@ -154,6 +163,7 @@ procedure ChangeWindowSize();
 begin
   gWinSizeX := gScreenWidth;
   gWinSizeY := gScreenHeight;
+  {$IFDEF HEADLESS}Exit;{$ENDIF}
   e_ResizeWindow(gScreenWidth, gScreenHeight);
   g_Game_SetupScreenSize();
   g_Menu_Reset();
@@ -165,6 +175,7 @@ var
   Preserve: Boolean;
 begin
   Result := False;
+  {$IFDEF HEADLESS}Exit;{$ENDIF}
   Preserve := False;
 
   if (gScreenWidth <> W) or (gScreenHeight <> H) then
@@ -195,7 +206,7 @@ begin
   Result := False;
   wActivate := False;
   wDeactivate := False;
-  
+
   case ev.event of
     SDL_WINDOWEVENT_MOVED:
     begin
@@ -205,7 +216,7 @@ begin
         gWinRealPosY := ev.data2;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_MINIMIZED:
     begin
       if not wMinimized then
@@ -221,7 +232,7 @@ begin
         wDeactivate := True;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_RESIZED:
     begin
       gScreenWidth := ev.data1;
@@ -234,10 +245,10 @@ begin
         e_WriteLog('[DEBUG] WinMsgs: Resized to ' + IntToStr(ev.data1) + 'x' + IntToStr(ev.data2), MSG_NOTIFY);
       end;
     end;
-    
+
     SDL_WINDOWEVENT_EXPOSED:
       SwapBuffers();
-    
+
     SDL_WINDOWEVENT_MAXIMIZED:
     begin
       if wMinimized then
@@ -256,7 +267,7 @@ begin
         end;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_RESTORED:
     begin
       if wMinimized then
@@ -365,7 +376,7 @@ begin
       key := ev.key.keysym.scancode;
       KeyPress(key);
     end;
-    
+
     SDL_TEXTINPUT:
     begin
       Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
@@ -381,6 +392,7 @@ end;
 
 procedure SwapBuffers();
 begin
+  {$IFDEF HEADLESS}Exit;{$ENDIF}
   SDL_GL_SwapWindow(h_Wnd);
 end;
 
@@ -412,9 +424,10 @@ begin
     exit;
   end;
 
+{$IFNDEF HEADLESS}
   h_Gl := SDL_GL_CreateContext(h_Wnd);
   if h_Gl = nil then Exit;
-
+{$ENDIF}
   //wWindowCreated := True;
 
   e_ResizeWindow(gScreenWidth, gScreenHeight);
@@ -423,10 +436,42 @@ begin
   Result := True;
 end;
 
+{$IFDEF WINDOWS}
+// windoze sux; in headless mode `GetTickCount()` (and SDL) returns shit
 function GetTimer(): Int64;
+var
+  F, C: Int64;
 begin
-  Result := SDL_GetTicks() * 1000; // TODO: do we really need microseconds here?
+  QueryPerformanceFrequency(F);
+  QueryPerformanceCounter(C);
+  Result := Round(C/F*1000{000});
 end;
+{$ELSE}
+function GetTimer(): Int64;
+var
+  t: Uint32;
+  tt: Int64;
+begin
+  t := SDL_GetTicks() {* 1000}; // TODO: do we really need microseconds here? k8: NOPE!
+  if ticksOverflow = -1 then
+  begin
+    ticksOverflow := 0;
+    lastTicks := t;
+  end
+  else
+  begin
+    if lastTicks > t then
+    begin
+      // overflow, increment overflow ;-)
+      ticksOverflow := ticksOverflow+(Int64($ffffffff)+Int64(1));
+      tt := (Int64($ffffffff)+Int64(1))+Int64(t);
+      t := Uint32(tt-lastTicks);
+    end;
+  end;
+  lastTicks := t;
+  result := ticksOverflow+Int64(t);
+end;
+{$ENDIF}
 
 procedure ResetTimer();
 begin
@@ -506,11 +551,11 @@ begin
 
   if wNeedTimeReset then
   begin
-    Time_Delta := 27777;
+    Time_Delta := (27777 div 1000);
     wNeedTimeReset := False;
   end;
 
-  t := Time_Delta div 27777;
+  t := Time_Delta div (27777 div 1000);
   if t > 0 then
   begin
     flag := True;
@@ -542,7 +587,7 @@ begin
 // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ:
   if flag then
   begin
-    Time_Old := Time - (Time_Delta mod 27777);
+    Time_Old := Time - (Time_Delta mod (27777 div 1000));
     if (not wMinimized) then
     begin
       Draw();
@@ -566,6 +611,7 @@ procedure InitOpenGL(VSync: Boolean);
 var
   v: Byte;
 begin
+  {$IFDEF HEADLESS}Exit;{$ENDIF}
   if VSync then v := 1 else v := 0;
   SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
   SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
@@ -579,6 +625,10 @@ end;
 
 function SDLMain(): Integer;
 begin
+{$IFDEF HEADLESS}
+  e_NoGraphics := True;
+{$ENDIF}
+
   e_WriteLog('Creating GL window', MSG_NOTIFY);
   if not CreateGLWindow(PChar(Format('Doom 2D: Forever %s', [GAME_VERSION]))) then
   begin