Changeset 17 for trunk/LocalPlayer/Term.pas

Timestamp:

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

Author:

chronos

Message:

• Fixed: Build under Linux.

File:

• trunk/LocalPlayer/Term.pas (modified) (11 diffs)

trunk/LocalPlayer/Term.pas

@@ -1 @@
-{$INCLUDE switches.pas}
+{$INCLUDE Switches.pas}
 unit Term;
 
@@ -5 +5 @@
 
 uses
-  Windows, Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
+  Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
 
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, Menus,
-  ExtCtrls,
+  ExtCtrls, dateutils, Platform,
   ButtonA, ButtonB, ButtonC, EOTButton, Area;
 
@@ -480 +480 @@
   Jump: array [0 .. nPl - 1] of integer;
   pTurn, pLogo, UnStartLoc, ToldSlavery: integer;
-  PerfFreq: int64;
   SmallScreen, GameOK, MapValid, skipped, idle: boolean;
 
@@ -4205 +4204 @@
       offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
       rec := Rect(0, 0, MapWidth, MapHeight);
+      {$IFDEF WINDOWS}{TODO Linux}
       ScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2),
         (ywd - yw) * yyt, rec, rec, 0, nil);
+      {$ENDIF}
       for DoInvalidate := false to FastScrolling do
       begin
@@ -4212 +4213 @@
         begin
           rec.Bottom := MapHeight - overlap;
+          {$IFDEF WINDOWS}{TODO Linux}
           ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
             rec, 0, nil);
+          {$ENDIF}
           ProcessOptions := prInvalidate;
         end
@@ -6009 +6012 @@
       SliceCount: integer;
     UnitInfo: TUnitInfo;
-    Ticks0, Ticks: int64;
+    Ticks0, Ticks: TDateTime;
   begin
     Timer1.Enabled := false;
-    QueryPerformanceCounter(Ticks0);
+    Ticks0 := NowPrecise;
     with ShowMove do
     begin
@@ -6095 +6098 @@
         Ticks := Ticks0;
         repeat
-          if (SliceCount = 0) or ((Ticks - Ticks0) * 12000 * (SliceCount + 1)
-            div SliceCount < MoveTime * PerfFreq) then
+          if (SliceCount = 0) or (MillisecondOf(Ticks - Ticks0) * 12 * (SliceCount + 1)
+            div SliceCount < MoveTime) then
           begin
             if not idle or (GameMode = cMovie) then
@@ -6103 +6106 @@
             inc(SliceCount)
           end;
-          QueryPerformanceCounter(Ticks);
-        until (Ticks - Ticks0) * 12000 >= MoveTime * PerfFreq;
+          Ticks := NowPrecise;
+        until MillisecondOf(Ticks - Ticks0) * 12 >= MoveTime;
         Ticks0 := Ticks
       end;
@@ -6466 +6469 @@
     var
       dx, dy: integer;
-      time0, time1: int64;
+      time0, time1: TDateTime;
     begin
       if GameMode = cMovie then
@@ -6551 +6554 @@
           ' ':
             begin // test map repaint time
-              QueryPerformanceCounter(time0);
+              time0 := NowPrecise;
               MapValid := false;
               MainOffscreenPaint;
-              QueryPerformanceCounter(time1);
+              time1 := NowPrecise;
               SimpleMessage(Format('Map repaint time: %.3f ms',
-                [{$IFDEF VER100}(time1.LowPart - time0.LowPart)
-{$ELSE}(time1 - time0){$ENDIF} * 1000.0 / PerfFreq]));
+                [MillisecondOf(time1 - time0)]));
             end
         end
@@ -8038 +8040 @@
 initialization
 
-QueryPerformanceFrequency(PerfFreq);
-
 end.