Changeset 80 for trunk

Timestamp:

Nov 4, 2014, 9:24:27 PM (10 years ago)

Author:

chronos

Message:

• Fixed: Autosave should not affect game filename and path selected by user.
• Fixed: In some cases more units was moved from cell then call have in total. Now move units only up to maximum of cell.

Location:

trunk

Files:

• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (3 diffs)

trunk/UCore.pas

@@ -141 +141 @@
 
 procedure TCore.AutoSave;
-begin
+var
+  OldFileName: string;
+begin
+  OldFileName := Game.FileName;
   Game.SaveToFile(GetAppConfigDir(False) + 'AutoSave.xtg');
-  GetUserDir;
+  Game.FileName := OldFileName;
 end;
 

trunk/UGame.pas

@@ -1802 +1802 @@
 var
   I: Integer;
-  Remain: Integer;
   AttackerPower: Integer;
   DefenderPower: Integer;
+  UnitCount: Integer;
 begin
   I := 0;
@@ -1811 +1811 @@
   if CountOnce > 0 then begin
     if CellFrom.Player = Player then begin
+      UnitCount := CountOnce;
+      if CountOnce > CellFrom.Power then
+        UnitCount := CellFrom.Power;
       if CellTo.Player = Player then begin
         // Inner move
-        CellTo.Power := CellTo.Power + CountOnce;
+        CellTo.Power := CellTo.Power + UnitCount;
       end else begin
-        AttackerPower := CountOnce;
+        AttackerPower := UnitCount;
         DefenderPower := CellTo.Power;
         Attack(AttackerPower, DefenderPower);
@@ -1830 +1833 @@
           raise Exception.Create(SUnfinishedBattle);
       end;
-      CellFrom.Power := CellFrom.Power - CountOnce;
+      CellFrom.Power := CellFrom.Power - UnitCount;
       CountOnce := 0;
     end;