X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame%2Fg_window.pas;h=5e7e926727f3989e0db09c1867e9750930e65c0b;hb=ea2a0471121aabe9ff059e29c1c42fa313307c23;hp=c159ddd236d40221480036aa03394f51e41b51f9;hpb=0968d19494ddf24230a822c02acbe3a3334bc3ad;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index c159ddd..5e7e926 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,8 +44,10 @@ var
   wLoadingProgress: Boolean = False;
   wLoadingQuit: Boolean = False;
   {wWinPause: Byte = 0;}
+{$IFNDEF WINDOWS}
   ticksOverflow: Int64 = -1;
   lastTicks: Uint32 = 0; // to detect overflow
+{$ENDIF}
 
 const
   // TODO: move this to a separate file
@@ -77,7 +81,7 @@ begin
   Result := True;
   Exit;
 {$ENDIF}
-  
+
   Result := False;
 
   e_WriteLog('Setting display mode...', MSG_NOTIFY);
@@ -85,13 +89,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;
@@ -113,7 +117,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);
 
@@ -204,7 +208,7 @@ begin
   Result := False;
   wActivate := False;
   wDeactivate := False;
-  
+
   case ev.event of
     SDL_WINDOWEVENT_MOVED:
     begin
@@ -214,7 +218,7 @@ begin
         gWinRealPosY := ev.data2;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_MINIMIZED:
     begin
       if not wMinimized then
@@ -230,7 +234,7 @@ begin
         wDeactivate := True;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_RESIZED:
     begin
       gScreenWidth := ev.data1;
@@ -243,10 +247,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
@@ -265,7 +269,7 @@ begin
         end;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_RESTORED:
     begin
       if wMinimized then
@@ -374,7 +378,7 @@ begin
       key := ev.key.keysym.scancode;
       KeyPress(key);
     end;
-    
+
     SDL_TEXTINPUT:
     begin
       Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
@@ -434,6 +438,17 @@ begin
   Result := True;
 end;
 
+{$IFDEF WINDOWS}
+// windoze sux; in headless mode `GetTickCount()` (and SDL) returns shit
+function GetTimer(): Int64;
+var
+  F, C: Int64;
+begin
+  QueryPerformanceFrequency(F);
+  QueryPerformanceCounter(C);
+  Result := Round(C/F*1000{000});
+end;
+{$ELSE}
 function GetTimer(): Int64;
 var
   t: Uint32;
@@ -458,6 +473,7 @@ begin
   lastTicks := t;
   result := ticksOverflow+Int64(t);
 end;
+{$ENDIF}
 
 procedure ResetTimer();
 begin
@@ -537,11 +553,11 @@ begin
 
   if wNeedTimeReset then
   begin
-    Time_Delta := (27777 div 1000);
+    Time_Delta := 28{(27777 div 1000)};
     wNeedTimeReset := False;
   end;
 
-  t := Time_Delta div (27777 div 1000);
+  t := Time_Delta div 28{(27777 div 1000)};
   if t > 0 then
   begin
     flag := True;
@@ -573,7 +589,7 @@ begin
 // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ:
   if flag then
   begin
-    Time_Old := Time - (Time_Delta mod (27777 div 1000));
+    Time_Old := Time - (Time_Delta mod 28{(27777 div 1000)});
     if (not wMinimized) then
     begin
       Draw();