Changeset 346

Timestamp:

Dec 25, 2024, 11:04:56 AM (16 hours ago)

Author:

chronos

Message:

• Fixed: Build on Linux.
• Modified: Improved internal code structure.

Location:

trunk

Files:

• Forms/FormItem.pas (modified) (2 diffs)
• Forms/FormList.lfm (modified) (5 diffs)
• Forms/FormList.pas (modified) (3 diffs)
• ItemList.pas (modified) (3 diffs)
• Player.pas (modified) (10 diffs)
• ServerList.pas (modified) (2 diffs)
• Units.pas (modified) (1 diff)

trunk/Forms/FormItem.pas

@@ -80 +80 @@
   J: Integer;
   Control: TControl;
-  ReferenceList: TItemList<TItem>;
+  ReferenceList: IList<TItem>;
   ReferenceItem: TItem;
 begin
@@ -106 +106 @@
       try
         TComboBox(Control).Items.Clear;
-        ReferenceList := TItemList<TItem>(Item.GetReferenceList(Index));
+        ReferenceList := Item.GetReferenceList(Index);
         if Assigned(ReferenceList) then
           for J := 0 to ReferenceList.Count - 1 do

trunk/Forms/FormList.lfm

@@ -1 +1 @@
 object FormList: TFormList
   Left = 1040
-  Height = 360
+  Height = 312
   Top = 540
-  Width = 480
+  Width = 417
   Caption = 'List'
-  ClientHeight = 360
-  ClientWidth = 480
-  DesignTimePPI = 144
+  ClientHeight = 312
+  ClientWidth = 417
+  DesignTimePPI = 125
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '3.4.0.0'
+  LCLVersion = '3.6.0.0'
   object ListView1: TListView
     Left = 0
-    Height = 322
+    Height = 279
     Top = 0
-    Width = 480
+    Width = 417
     Align = alClient
     Columns = <    
       item
         Caption = 'Name'
-        Width = 466
+        Width = 405
       end>
     MultiSelect = True
@@ -39 +40 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 38
-    Top = 322
-    Width = 480
+    Height = 33
+    Top = 279
+    Width = 417
     Align = alBottom
     Images = Core.ImageListSmall
@@ -54 +55 @@
     end
     object ToolButton2: TToolButton
-      Left = 36
+      Left = 31
       Top = 2
       Action = AModify
     end
     object ToolButton3: TToolButton
-      Left = 71
+      Left = 61
       Top = 2
       Action = ARemove
     end
     object ToolButton4: TToolButton
-      Left = 106
+      Left = 91
       Top = 2
       Action = AClone
@@ -71 +72 @@
   object ActionList1: TActionList
     Images = Core.ImageListSmall
-    Left = 208
-    Top = 163
+    Left = 181
+    Top = 141
     object AAdd: TAction
       Caption = 'Add'
@@ -101 +102 @@
   object PopupMenu1: TPopupMenu
     Images = Core.ImageListSmall
-    Left = 352
-    Top = 160
+    Left = 306
+    Top = 139
     object MenuItem1: TMenuItem
       Action = AAdd

trunk/Forms/FormList.pas

@@ -35 +35 @@
     procedure ASelectAllExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ListView1CustomDrawSubItem(Sender: TCustomListView;
@@ -182 +183 @@
 end;
 
+procedure TFormList.FormDestroy(Sender: TObject);
+begin
+  List := nil;
+end;
+
 procedure TFormList.FormShow(Sender: TObject);
 begin
@@ -254 +260 @@
   if FList = AValue then Exit;
   FList := AValue;
+  UpdateInterface;
+  UpdateList;
 end;
 

trunk/ItemList.pas

@@ -184 +184 @@
   while Count < Source.Count do AddItem('');
   for I := 0 to Count - 1 do
-    TItem(Items[I]).Assign(Source.Items[I]);
+    Items[I].Assign(Source.Items[I]);
 end;
 
@@ -201 +201 @@
 function TItemList<T>.AddItem(Name: string): T;
 begin
-  Result := T.Create;
-  Result.Name := Name;
+  Result := CreateItem(Name);
   Result.Id := GetNewId;
   Add(Result);
@@ -253 +252 @@
 end;
 
-function TItemList<T>.QueryInterface(constref iid: tguid; out obj): LongInt;
-  stdcall;
+function TItemList<T>.QueryInterface({$IFDEF FPC_HAS_CONSTREF}constref{$ELSE}const{$ENDIF} iid: tguid; out obj): LongInt;
+  {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
 begin
   Result := 0;
 end;
 
-function TItemList<T>._AddRef: LongInt; stdcall;
+function TItemList<T>._AddRef: LongInt; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
 begin
   Result := 0;
 end;
 
-function TItemList<T>._Release: LongInt; stdcall;
+function TItemList<T>._Release: LongInt; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
 begin
   Result := 0;

trunk/Player.pas

@@ -137 +137 @@
   public
     Game: TObject; //TGame;
+    procedure Assign(Source: TItemList<TPlayer>); override;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
     function CreateItem(Name: string = ''): TPlayer; override;
@@ -160 +161 @@
     CountOnce: Integer;
     CountRepeat: Integer;
+    procedure Assign(Source: TUnitMove);
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -173 +175 @@
     Game: TObject; //TGame;
     Player: TPlayer;
+    procedure Assign(Source: TUnitMoves);
     function SearchByFromTo(CellFrom, CellTo: TPlayerCell): TUnitMove;
     procedure LoadFromNode(Node: TDOMNode);
@@ -416 +419 @@
 begin
   for I := 0 to Cells.Count - 1 do
-  with TPlayerCell(Cells[I]) do begin
+  with Cells[I] do begin
     for J := Neighbors.Count - 1 downto 0 do
       DisconnectFrom(Neighbors[J]);
@@ -440 +443 @@
   with TPlayerCell(Cells[I]) do begin
     for J := 0 to MapCell.Neighbors.Count - 1 do
-      ConnectTo(TPlayerCell(TCell(MapCell.Neighbors[J]).PlayerCell));
+      ConnectTo(TPlayerCell(MapCell.Neighbors[J].PlayerCell));
   end;
 end;
@@ -499 +502 @@
 end;
 
+procedure TPlayers.Assign(Source: TItemList<TPlayer>);
+var
+  I: Integer;
+begin
+  inherited;
+  for I := 0 to Count - 1 do
+    Items[I].Game := Game;
+end;
+
 procedure TPlayers.New(Name: string; Color: TColor; Mode: TPlayerMode);
-begin
-  AddItem(Name);
-  Last.Color := Color;
-  Last.Mode := Mode;
+var
+  NewPlayer: TPlayer;
+begin
+  NewPlayer := AddItem(Name);
+  NewPlayer.Color := Color;
+  NewPlayer.Mode := Mode;
   if Mode = pmComputer then
-    Last.Agressivity := caMedium;
+    NewPlayer.Agressivity := caMedium;
 end;
 
@@ -583 +597 @@
 { TUnitMoves }
 
+procedure TUnitMoves.Assign(Source: TUnitMoves);
+var
+  I: Integer;
+begin
+  while Count > Source.Count do
+    Delete(Count - 1);
+  while Count < Source.Count do
+    Add(TUnitMove.Create);
+  for I := 0 to Count - 1 do begin
+    Items[I].Assign(Source.Items[I]);
+  end;
+end;
+
 function TUnitMoves.SearchByFromTo(CellFrom, CellTo: TPlayerCell): TUnitMove;
 var
@@ -663 +690 @@
       else raise Exception.Create('Unit move already exists');
   end else
+end;
+
+procedure TUnitMove.Assign(Source: TUnitMove);
+begin
+  CountOnce := Source.CountOnce;
+  CountRepeat := Source.CountRepeat;
+  CellFrom.MapCell.Id := Source.CellFrom.MapCell.Id;
+  CellTo.MapCell.Id := Source.CellTo.MapCell.Id;
 end;
 
@@ -801 +836 @@
 begin
   inherited;
-  //Game := TPlayer(Source).Game;
   TotalCells := TPlayer(Source).TotalCells;
   TotalUnits := TPlayer(Source).TotalUnits;
@@ -809 +843 @@
   StartCell := TPlayer(Source).StartCell;
   Color := TPlayer(Source).Color;
-  //Units.Assign(TPlayer(Source).Units);
+  Units.Assign(TPlayer(Source).Units);
+  Moves.Assign(TPlayer(Source).Moves);
   Nation := TPlayer(Source).Nation;
 end;

trunk/ServerList.pas

@@ -23 +23 @@
   end;
 
+  { TServerInfos }
+
   TServerInfos = class(TObjectList<TServerInfo>)
+    procedure Assign(Source: TServerInfos);
   end;
 
@@ -64 +67 @@
 end;
 
+{ TServerInfos }
+
+procedure TServerInfos.Assign(Source: TServerInfos);
+var
+  I: Integer;
+begin
+  while Count > Source.Count do
+    Delete(Count - 1);
+  while Count < Source.Count do
+    Add(TServerInfo.Create);
+  for I := 0 to Count - 1 do begin
+    Items[I].Assign(Source.Items[I]);
+  end;
+end;
+
 { TServerList }
 
 procedure TServerList.Assign(Source: TServerList);
-var
-  I: Integer;
 begin
-  while Items.Count > Source.Items.Count do
-    Items.Delete(Items.Count - 1);
-  while Items.Count < Source.Items.Count do
-    Items.Add(TServerInfo.Create);
-  for I := 0 to Items.Count - 1 do begin
-    Items[I].Assign(Source.Items[I]);
-  end;
+  Name := Source.Name;
+  Address := Source.Address;
+  Items.Assign(Source.Items);
 end;
 

trunk/Units.pas

@@ -138 +138 @@
   for I := 0 to Count - 1 do begin
     Items[I].Assign(Source[I]);
+    Items[I].Game := Game;
   end;
   NewId := Source.NewId;