X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=5f372f36526ca64b58316537104a2d05095f5bdc;hb=921c3b45ee6dd3b39307f4d1d6c05ab1c137bd49;hp=0429b77368be262a7b3d8e08c997e6653926e5fc;hpb=1fffc4a51fc4ef50b4be44ba53239d5843afab9a;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 0429b77..5f372f3 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -1,9 +1,25 @@
+(* Copyright (C)  DooM 2D:Forever Developers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *)
+{$MODE DELPHI}
 unit g_window;
 
 interface
 
 uses
-  WADEDITOR;
+  wadreader;
 
 function  SDLMain(): Integer;
 function  GetTimer(): Int64;
@@ -23,7 +39,7 @@ function  g_Window_SetSize(W, H: Word; FScreen: Boolean): Boolean;
 implementation
 
 uses
-{$IFDEF WIN32}Windows,{$ENDIF}
+{$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;
@@ -43,8 +59,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
@@ -78,7 +96,7 @@ begin
   Result := True;
   Exit;
 {$ENDIF}
-  
+
   Result := False;
 
   e_WriteLog('Setting display mode...', MSG_NOTIFY);
@@ -86,13 +104,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;
@@ -114,7 +132,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);
 
@@ -205,7 +223,7 @@ begin
   Result := False;
   wActivate := False;
   wDeactivate := False;
-  
+
   case ev.event of
     SDL_WINDOWEVENT_MOVED:
     begin
@@ -215,7 +233,7 @@ begin
         gWinRealPosY := ev.data2;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_MINIMIZED:
     begin
       if not wMinimized then
@@ -231,7 +249,7 @@ begin
         wDeactivate := True;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_RESIZED:
     begin
       gScreenWidth := ev.data1;
@@ -244,10 +262,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
@@ -266,7 +284,7 @@ begin
         end;
       end;
     end;
-    
+
     SDL_WINDOWEVENT_RESTORED:
     begin
       if wMinimized then
@@ -375,7 +393,7 @@ begin
       key := ev.key.keysym.scancode;
       KeyPress(key);
     end;
-    
+
     SDL_TEXTINPUT:
     begin
       Utf8ToUnicode(@uc, PChar(ev.text.text), 1);
@@ -435,7 +453,7 @@ begin
   Result := True;
 end;
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
 // windoze sux; in headless mode `GetTickCount()` (and SDL) returns shit
 function GetTimer(): Int64;
 var
@@ -550,11 +568,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;
@@ -586,7 +604,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();