Changeset 465 for branches/highdpi/Network

Timestamp:

Nov 30, 2023, 10:16:14 PM (19 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

Location:

branches/highdpi/Network

Files:

• NetworkClient.pas (moved) (moved from branches/highdpi/Network/UNetworkClient.pas ) (4 diffs)
• NetworkCommon.pas (moved) (moved from branches/highdpi/Network/UNetworkCommon.pas ) (3 diffs)
• NetworkServer.pas (moved) (moved from branches/highdpi/Network/UNetworkServer.pas ) (7 diffs)

branches/highdpi/Network/NetworkClient.pas

@@ -1 @@
-unit UNetworkClient;
-
-{$mode delphi}
+unit NetworkClient;
 
 interface
 
 uses
-  Classes, SysUtils{$IFDEF LINUX}, fpAsync, fpsock{$ENDIF}, Protocol;
+  Classes, SysUtils{$IFDEF UNIX}, fpAsync, fpsock{$ENDIF}, Protocol;
 
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 type
   { TTCPClientThread }
@@ -48 +46 @@
 
 uses
-  LocalPlayer{$IFDEF LINUX}, Global, UNetworkCommon{$ENDIF};
+  LocalPlayer{$IFDEF UNIX}, Global, NetworkCommon{$ENDIF};
 
 procedure Client(Command, Player: Integer; var Data);
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 var
   Cmd: TCommand;
 {$ENDIF}
 begin
-  {$IFDEF LINUX}
+  {$IFDEF UNIX}
   Cmd := TCommand(Command);
   case Cmd of
@@ -73 +71 @@
 end;
 
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 function LocalServer(Command, Player, Subject: Integer; var Data): Integer; stdcall;
 begin
@@ -178 +176 @@
 end.
 
+

branches/highdpi/Network/NetworkCommon.pas

@@ -1 @@
-unit UNetworkCommon;
-
-{$mode delphi}
+unit NetworkCommon;
 
 interface
@@ -10 +8 @@
 procedure StreamAppend(Stream: TStream; SourceStream: TStream);
 procedure StreamRemoveRead(Stream: TMemoryStream);
+
 
 implementation
@@ -45 +44 @@
 end.
 
+

branches/highdpi/Network/NetworkServer.pas

@@ -1 @@
-unit UNetworkServer;
-
-{$mode delphi}
+unit NetworkServer;
 
 interface
 
 uses
-  Classes, SysUtils{$IFDEF LINUX}, fgl, fpAsync, fpsock, fphttpclient{$ENDIF}, Protocol;
-
-{$IFDEF LINUX}
+  Classes, SysUtils{$IFDEF UNIX}, Generics.Collections, fpAsync, fpsock,
+  fphttpclient{$ENDIF}, Protocol;
+
+{$IFDEF UNIX}
 type
   TNetworkServer = class;
@@ -57 +56 @@
   { TNetworkServerPlayers }
 
-  TNetworkServerPlayers = class(TFPGObjectList<TNetworkServerPlayer>)
+  TNetworkServerPlayers = class(TObjectList<TNetworkServerPlayer>)
     function SearchById(Id: Integer): TNetworkServerPlayer;
   end;
@@ -66 +65 @@
   private
     Players: TNetworkServerPlayers;
-    Connections: TFPGObjectList<TNetworkServerConnection>;
+    Connections: TObjectList<TNetworkServerConnection>;
     TCPServerThread: TTCPServerThread;
     ServerEventLoop: TEventLoop;
     procedure ConnectExecute(Sender: TConnectionBasedSocket; AStream: TSocketStream);
-    procedure Client(Command: TCommand; Player: integer; var Data);
+    procedure Client(Command: TCommand; Player: Integer; var Data);
   public
     TCPServer: TTCPServer;
@@ -82 +81 @@
 {$ENDIF}
 
-procedure Client(Command, Player: integer; var Data); stdcall;
+procedure Client(Command, Player: Integer; var Data); stdcall;
 
 
 implementation
 
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 uses
-  Global, UNetworkCommon;
+  Global, NetworkCommon;
 {$ENDIF}
 
-procedure Client(Command, Player: integer; var Data);
-begin
-  {$IFDEF LINUX}
+procedure Client(Command, Player: Integer; var Data);
+begin
+  {$IFDEF UNIX}
   if not Assigned(NetworkServer) then begin
     NetworkServer := TNetworkServer.Create;
@@ -107 +106 @@
 end;
 
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 
 { TNetworkServerPlayers }
@@ -304 +303 @@
   Players := TNetworkServerPlayers.Create;
   ServerEventLoop := TEventLoop.Create;
-  Connections := TFPGObjectList<TNetworkServerConnection>.Create;
+  Connections := TObjectList<TNetworkServerConnection>.Create;
   TCPServer := TTCPServer.Create(nil);
   with TCPServer do begin
@@ -339 +338 @@
 end.
 
+