Changeset 377

Timestamp:

Jan 3, 2025, 11:20:28 PM (5 days ago)

Author:

chronos

Message:

• Fixed: Map image was not always loaded and applied.

Location:

trunk

Files:

• ClientGUI.pas (modified) (1 diff)
• Core.pas (modified) (2 diffs)
• Forms/FormMove.lfm (modified) (16 diffs)
• Forms/FormMove.lrj (modified) (2 diffs)
• Forms/FormNew.pas (modified) (1 diff)
• Game.pas (modified) (4 diffs)
• Images/Screenshots/xTactics.png (modified) ( previous)

trunk/ClientGUI.pas

@@ -17 +17 @@
     procedure SetZoom(AValue: Double);
   public
-    Game: TObject; //TGame;
+    Game: TObject; // TGame;
     SourceRect: TRect;
     FocusedCell: TPlayerCell;

trunk/Core.pas

@@ -370 +370 @@
       Server.Game := Game;
       Game.Running := False;
-      Game.PostConfig;
       Game.Assign(NewServer.Game);
       GameSettings.Assign(NewServer.Game);
@@ -738 +737 @@
 
   if Game.FileName = '' then begin
-    GameSettings.PostConfig;
     Game.Assign(GameSettings);
     StartNewGame;

trunk/Forms/FormMove.lfm

@@ -1 +1 @@
 object FormMove: TFormMove
-  Left = 1104
-  Height = 299
-  Top = 604
-  Width = 467
+  Left = 938
+  Height = 318
+  Top = 539
+  Width = 493
   ActiveControl = ButtonOk
   Caption = 'Move'
-  ClientHeight = 299
-  ClientWidth = 467
+  ClientHeight = 318
+  ClientWidth = 493
   Constraints.MinHeight = 100
   Constraints.MinWidth = 350
@@ -16 +16 @@
   LCLVersion = '3.6.0.0'
   object ButtonOk: TButton
-    Left = 134
+    Left = 160
     Height = 38
-    Top = 253
+    Top = 272
     Width = 100
     Anchors = [akRight, akBottom]
@@ -28 +28 @@
   end
   object ButtonCancel: TButton
-    Left = 246
+    Left = 272
     Height = 38
-    Top = 253
+    Top = 272
     Width = 100
     Anchors = [akRight, akBottom]
@@ -38 +38 @@
     TabOrder = 1
   end
-  object LabelWinProbability: TLabel
-    Left = 264
-    Height = 26
-    Top = 8
-    Width = 15
-    Caption = '   '
-    ParentColor = False
-    ParentFont = False
-  end
   object ButtonRemove: TButton
-    Left = 358
+    Left = 384
     Height = 38
-    Top = 253
+    Top = 272
     Width = 100
     Anchors = [akRight, akBottom]
@@ -60 +51 @@
   object ScrollBox1: TScrollBox
     Left = 8
-    Height = 231
+    Height = 250
     Top = 8
-    Width = 451
+    Width = 477
     HorzScrollBar.Page = 298
-    VertScrollBar.Page = 214
+    VertScrollBar.Page = 222
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 8
-    ClientHeight = 229
-    ClientWidth = 449
+    ClientHeight = 248
+    ClientWidth = 475
     TabOrder = 3
     object Label3: TLabel
@@ -83 +74 @@
       Left = 8
       Height = 26
-      Top = 48
+      Top = 56
       Width = 49
       Caption = 'Once:'
@@ -92 +83 @@
       Left = 200
       Height = 43
-      Top = 40
+      Top = 48
       Width = 98
       OnChange = SpinEditOnceChange
@@ -102 +93 @@
       Left = 8
       Height = 38
-      Top = 88
+      Top = 96
       Width = 80
       Caption = 'Min'
@@ -111 +102 @@
     object TrackBarOnce: TTrackBar
       Left = 96
-      Height = 58
-      Top = 80
-      Width = 256
+      Height = 30
+      Top = 104
+      Width = 282
       OnChange = TrackBarOnceChange
       PageSize = 1
@@ -124 +115 @@
     end
     object ButtonOnceMax: TButton
-      Left = 361
+      Left = 387
       Height = 38
-      Top = 88
+      Top = 96
       Width = 80
       Anchors = [akTop, akRight]
@@ -135 +126 @@
     end
     object ButtonRepeatMax: TButton
-      Left = 361
+      Left = 387
       Height = 38
-      Top = 176
+      Top = 184
       Width = 80
       Anchors = [akTop, akRight]
@@ -148 +139 @@
       Left = 200
       Height = 43
-      Top = 128
+      Top = 136
       Width = 98
       OnChange = SpinEditRepeatChange
@@ -158 +149 @@
       Left = 96
       Height = 30
-      Top = 180
-      Width = 256
+      Top = 188
+      Width = 282
       OnChange = TrackBarRepeatChange
       PageSize = 1
@@ -172 +163 @@
       Left = 8
       Height = 38
-      Top = 176
+      Top = 184
       Width = 80
       Caption = 'Min'
@@ -182 +173 @@
       Left = 8
       Height = 26
-      Top = 136
+      Top = 144
       Width = 90
       Caption = 'Every turn:'
@@ -188 +179 @@
       ParentFont = False
     end
+    object LabelWinProbability: TLabel
+      Left = 264
+      Height = 26
+      Top = 8
+      Width = 15
+      Caption = '   '
+      ParentColor = False
+      ParentFont = False
+    end
   end
 end

trunk/Forms/FormMove.lrj

@@ -3 +3 @@
 {"hash":1371,"name":"tformmove.buttonok.caption","sourcebytes":[79,107],"value":"Ok"},
 {"hash":77089212,"name":"tformmove.buttoncancel.caption","sourcebytes":[67,97,110,99,101,108],"value":"Cancel"},
-{"hash":8736,"name":"tformmove.labelwinprobability.caption","sourcebytes":[32,32,32],"value":"   "},
 {"hash":78392485,"name":"tformmove.buttonremove.caption","sourcebytes":[68,101,108,101,116,101],"value":"Delete"},
 {"hash":261993402,"name":"tformmove.label3.caption","sourcebytes":[87,105,110,32,112,114,111,98,97,98,105,108,105,116,121,58],"value":"Win probability:"},
@@ -11 +10 @@
 {"hash":21384,"name":"tformmove.buttonrepeatmax.caption","sourcebytes":[77,97,120],"value":"Max"},
 {"hash":21502,"name":"tformmove.buttonrepeatmin.caption","sourcebytes":[77,105,110],"value":"Min"},
-{"hash":188155274,"name":"tformmove.label2.caption","sourcebytes":[69,118,101,114,121,32,116,117,114,110,58],"value":"Every turn:"}
+{"hash":188155274,"name":"tformmove.label2.caption","sourcebytes":[69,118,101,114,121,32,116,117,114,110,58],"value":"Every turn:"},
+{"hash":8736,"name":"tformmove.labelwinprobability.caption","sourcebytes":[32,32,32],"value":"   "}
 ]}

trunk/Forms/FormNew.pas

@@ -384 +384 @@
   GamePreview.GameSystem.Assign(FServer.Game.GameSystem);
   SaveGame(GamePreview);
-  GamePreview.PostConfig;
   GamePreview.GeneratePlayers := False;
   GamePreview.New;

trunk/Game.pas

@@ -86 +86 @@
     StoredRandSeed: Cardinal;
     GeneratePlayers: Boolean;
-    procedure PostConfig;
     procedure Assign(Source: TGame);
     function AttackProbability(AttackCount, DefendCount: Integer): Double;
@@ -297 +296 @@
   Cell: TCell;
 begin
+  // Load map image
+  if (Map.Shape = msImage) then begin
+    if LoadedImageFileName <> MapImageFileName then begin
+      LoadedImageFileName := MapImageFileName;
+      if FileExists(MapImageFileName) then begin
+        Map.Image.Picture.LoadFromFile(MapImageFileName)
+      end else begin
+        LoadedImageFileName := '';
+        Map.Image.Picture.Clear;
+      end;
+    end;
+  end;
+
   // Randomize map terrain
   for Cell in Map.Cells do
@@ -376 +388 @@
 end;
 
-procedure TGame.PostConfig;
-begin
-  if (Map.Shape = msImage) and FileExists(MapImageFileName) and
-  (LoadedImageFileName <> MapImageFileName) then begin
-    LoadedImageFileName := MapImageFileName;
-    Map.Image.Picture.LoadFromFile(MapImageFileName);
-  end;
-end;
-
 procedure TGame.SelectPlayerStartCell(Player: TPlayer);
 var
@@ -502 +505 @@
   Map.Assign(Source.Map);
   MapImageFileName := Source.MapImageFileName;
+  LoadedImageFileName := Source.LoadedImageFileName;
   VoidEnabled := Source.VoidEnabled;
   VoidPercentage := Source.VoidPercentage;