Changeset 12 for trunk/UGame.pas

Timestamp:

Feb 18, 2014, 8:47:40 PM (11 years ago)

Author:

chronos

Message:

• Added: Form where move parameters can be adjusted.

File:

• trunk/UGame.pas (modified) (4 diffs)

trunk/UGame.pas

@@ -74 +74 @@
   { TGame }
 
+  TMoveEvent = procedure(CellFrom, CellTo: TCell; var CountOnce, CountRepeat: Integer) of object;
+
   TGame = class
   private
+    FOnMove: TMoveEvent;
     procedure MoveAll(Player: TPlayer);
-    procedure SetMove(CellFrom, CellTo: TCell; Count: Integer);
+    procedure SetMove(CellFrom, CellTo: TCell);
   public
     Players: TObjectList; // TList<TPlayer>
@@ -88 +91 @@
     destructor Destroy; override;
     procedure New;
+  published
+    property OnMove: TMoveEvent read FOnMove write FOnMove;
   end;
 
@@ -162 +167 @@
     if IsCellsNeighbor(NewSelectedCell, SelectedCell) then begin
       Game.SetMove(TCell(Game.Map.Cells[SelectedCell.Y, SelectedCell.X]),
-        TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]),
-        TCell(Game.Map.Cells[SelectedCell.Y, SelectedCell.X]).Power);
+        TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]));
       SelectedCell := Point(-1, -1);
     end else
@@ -221 +225 @@
 end;
 
-procedure TGame.SetMove(CellFrom, CellTo: TCell; Count: Integer);
+procedure TGame.SetMove(CellFrom, CellTo: TCell);
 var
   NewMove: TMove;
   I: Integer;
+  CountOnce: Integer;
+  CountRepeat: Integer;
 begin
   I := 0;
-  while (I < Moves.Count) and (TMove(Moves[I]).CellFrom <> CellFrom) and
-    (TMove(Moves[I]).CellTo <> CellTo) do Inc(I);
+  while (I < Moves.Count) and ((TMove(Moves[I]).CellFrom <> CellFrom) or
+    (TMove(Moves[I]).CellTo <> CellTo)) do Inc(I);
+  if I < Moves.Count then begin
+    CountOnce := TMove(Moves[I]).CountOnce;
+    CountRepeat := TMove(Moves[I]).CountRepeat;
+  end else begin
+    CountOnce := CellFrom.Power;
+    CountRepeat := 0;
+  end;
+  if Assigned(FOnMove) then FOnMove(CellFrom, CellTo, CountOnce, CountRepeat);
   if I < Moves.Count then begin
     // Already have such move
-    if Count = 0 then Moves.Delete(I)
-      else TMove(Moves[I]).CountOnce := Count;
+    if (CountOnce = 0) and (CountRepeat = 0) then Moves.Delete(I)
+      else begin
+        TMove(Moves[I]).CountOnce := CountOnce;
+         TMove(Moves[I]).CountOnce := CountOnce;
+      end;
   end else begin
     // Add new move
-    if Count > 0 then begin
+    if (CountOnce > 0) or (CountRepeat > 0) then begin
       NewMove := TMove(Moves[Moves.Add(TMove.Create)]);
       NewMove.CellFrom := CellFrom;
       NewMove.CellTo := CellTo;
-      NewMove.CountOnce := Count;
+      NewMove.CountOnce := CountOnce;
+      NewMove.CountRepeat := CountRepeat;
     end;
   end;