Changeset 17 for trunk/NoTerm.pas

Timestamp:

Jan 8, 2017, 11:21:02 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Build under Linux.

File:

• trunk/NoTerm.pas (modified) (9 diffs)

trunk/NoTerm.pas

@@ -1 @@
-{$INCLUDE switches}
+{$INCLUDE Switches.pas}
 unit NoTerm;
 
@@ -5 +5 @@
 
 uses
-  ScreenTools, Protocol, Messg,
-
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  ScreenTools, Protocol, Messg, LCLIntf, LCLType, dateutils, Platform,
+
+  Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ButtonBase, ButtonB;
 
@@ -23 +23 @@
   private
     me, Active, ToldAlive, Round: integer;
-    PerfFreq, LastShowYearTime, LastShowTurnChange, LastNewTurn: int64;
+    LastShowYearTime, LastShowTurnChange, LastNewTurn: TDateTime;
     TurnTime, TotalStatTime: extended;
     G: TNewGameData;
@@ -47 +47 @@
 uses GameServer, log, Start;
 
-{$R *.DFM}
+{$R *.dfm}
 
 const
@@ -81 +81 @@
   TitleHeight := 36;
   InitButtons();
-  QueryPerformanceFrequency(PerfFreq);
   LastShowYearTime := 0;
 end;
@@ -139 +138 @@
   ShipComplete: boolean;
   r: TRect;
-  now: int64;
+  nowt: TDateTime;
 begin
   case Command of
@@ -213 +212 @@
         end; // should not happen
 
-        QueryPerformanceCounter(now);
-        if {$IFDEF VER100}(now.LowPart - LastShowYearTime.LowPart){$ELSE}(now - LastShowYearTime){$ENDIF} / PerfFreq >= UpdateInterval then
+        nowt := NowPrecise;
+        if SecondOf(nowt - LastShowYearTime) >= UpdateInterval then
         begin
           ShowYear;
-          LastShowYearTime := now;
+          LastShowYearTime := nowt;
         end;
-        TurnTime :=
-        {$IFDEF VER100}(now.LowPart - LastNewTurn.LowPart){$ELSE}(now - LastNewTurn){$ENDIF} / PerfFreq;
-        LastNewTurn := now;
+        TurnTime := SecondOf(nowt - LastNewTurn);
+        LastNewTurn := nowt;
         if (G.RO[me].Alive <> ToldAlive) then
         begin
@@ -267 +265 @@
     cShowTurnChange:
       begin
-        QueryPerformanceCounter(now);
+        nowt := NowPrecise;
         if Active >= 0 then
         begin
-          ActiveDuration :=
-          {$IFDEF VER100}(now.LowPart - LastShowTurnChange.LowPart){$ELSE}(now - LastShowTurnChange){$ENDIF} / PerfFreq;
+          ActiveDuration := SecondOf(nowt - LastShowTurnChange);
           TimeStat[Active] := TimeStat[Active] + ActiveDuration;
           TotalStatTime := TotalStatTime + ActiveDuration;
@@ -279 +276 @@
             (ActiveDuration < ShowActiveThreshold);
         end;
-        LastShowTurnChange := now;
+        LastShowTurnChange := nowt;
 
         Active := integer(Data);