Changeset 423 for trunk/LocalPlayer

Timestamp:

Apr 25, 2022, 6:01:01 PM (3 years ago)

Author:

chronos

Message:

• Modified: Do not use explicit mode delphi directive as it is already set in project.
• Modified: Use UNIX instead of LINUX for conditional code to work also on FreeBSD.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (1 diff)
• Term.pas (modified) (5 diffs)
• UKeyBindings.pas (modified) (1 diff)

trunk/LocalPlayer/CityScreen.pas

@@ -5 +5 @@
 
 uses
-  {$IFDEF LINUX}LMessages,{$ENDIF}
+  {$IFDEF UNIX}LMessages,{$ENDIF}
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,

trunk/LocalPlayer/Term.pas

@@ -5 +5 @@
 
 uses
-{$IFDEF Windows}
+{$IFDEF WINDOWS}
   Windows,
 {$ENDIF}
-{$IFDEF Linux}
+{$IFDEF UNIX}
   LMessages, Messages,
 {$ENDIF}
@@ -4705 +4705 @@
 end;
 
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 // Can't do scrolling of DC under Linux, then fallback into BitBlt.
 function ScrollDC(Canvas: TCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
@@ -4763 +4763 @@
         rec, rec, 0, nil);
 {$ENDIF}
-{$IFDEF LINUX}
+{$IFDEF UNIX}
       ScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
         rec, rec, 0, nil);
@@ -4774 +4774 @@
             rec, 0, nil);
 {$ENDIF}
-{$IFDEF LINUX}
+{$IFDEF UNIX}
           ScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
             rec, rec, 0, nil);
@@ -6672 +6672 @@
       NoMap.PaintUnit(xMoving - xMin, yMoving - yMin, UnitInfo, 0);
       PaintBufferToScreen(xMin, yMin, xRange, yRange);
-      {$IFDEF LINUX}
-      // TODO: Force animation under linux
+      {$IFDEF UNIX}
+      // TODO: Force animation under UNIX
       Application.ProcessMessages;
       {$ENDIF}

trunk/LocalPlayer/UKeyBindings.pas

@@ -1 +1 @@
 unit UKeyBindings;
-
-{$mode delphi}
 
 interface