Changeset 302 for trunk

Timestamp:

Aug 11, 2019, 11:06:54 AM (5 years ago)

Author:

chronos

Message:

• Fixed: Some repeated moves were disappearing.
• Fixed: Move once count was not set correctly on unit move edit.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (1 diff)
• UPlayer.pas (modified) (2 diffs)

trunk/Forms/UFormClient.pas

@@ -148 +148 @@
     if Update then FormMove.SpinEditOnce.MaxValue := CellFrom.GetAvialPower + CountOnce
       else FormMove.SpinEditOnce.MaxValue := CellFrom.GetAvialPower;
+    FormMove.TrackBarOnce.Max := FormMove.SpinEditOnce.MaxValue;
     FormMove.SpinEditOnce.Value := CountOnce;
-    FormMove.TrackBarOnce.Max := FormMove.SpinEditOnce.MaxValue;
     FormMove.TrackBarOnce.Position := FormMove.SpinEditOnce.Value;
     FormMove.SpinEditRepeat.MaxValue := Client.Game.Map.MaxPower;
+    FormMove.TrackBarRepeat.Max := FormMove.SpinEditRepeat.MaxValue;
     FormMove.SpinEditRepeat.Value := CountRepeat;
-    FormMove.TrackBarRepeat.Max := FormMove.SpinEditRepeat.MaxValue;
     FormMove.TrackBarRepeat.Position := FormMove.SpinEditRepeat.Value;
 

trunk/UPlayer.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, UMap, DOM, fgl, XMLConf, UXMLUtils, Math,
+  Classes, SysUtils, Graphics, UMap, DOM, fgl2, XMLConf, UXMLUtils, Math,
   UGeometry, UUnit, UNation, UItemList;
 
@@ -943 +943 @@
     if not Assigned(CellTo.MapCell.OneUnit) then begin
       CellTo.MapCell.OneUnit := TGame(Game).Units.AddNew(CellFrom.MapCell.OneUnit.Kind, 0);
+      CellTo.MapCell.OneUnit.Player := Self;
       CellTo.MapCell.Player := Self;
     end;