Changeset 14

Timestamp:

Feb 19, 2014, 10:51:42 PM (11 years ago)

Author:

chronos

Message:

• Modified: Refer to cell by object reference instead of TPoint position.

File:

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

trunk/UGame.pas

@@ -52 +52 @@
     Cells: array of array of TCell;
     function PosToCell(Pos: TPoint; Rect: TRect; Zoom: Double
-      ): TPoint;
+      ): TCell;
     function CellToPos(Cell: TCell; Rect: TRect; Zoom: Double
       ): TPoint;
     function GetHexagonPolygon(Pos: TPoint; HexSize: TPoint): TPointArray;
-    procedure Paint(Canvas: TCanvas; Rect: TRect; Zoom: Double; SelectedCell: TPoint);
+    procedure Paint(Canvas: TCanvas; Rect: TRect; Zoom: Double; SelectedCell: TCell);
     constructor Create;
     destructor Destroy; override;
@@ -74 +74 @@
     Color: TColor;
     ViewZoom: Double;
-    SelectedCell: TPoint;
+    SelectedCell: TCell;
     Mode: TPlayerMode;
     procedure ComputerTurn;
@@ -141 +141 @@
 end;
 
-function IsCellsNeighbor(Cell1, Cell2: TPoint): Boolean;
+function IsCellsNeighbor(Cell1, Cell2: TCell): Boolean;
 var
   DX: Integer;
@@ -147 +147 @@
   MinY: Integer;
 begin
-  if Cell1.Y < Cell2.Y then MinY:= Cell1.Y
-    else MinY := Cell2.Y;
-  DX := Cell2.X - Cell1.X;
-  DY := Cell2.Y - Cell1.Y;
+  if Cell1.Pos.Y < Cell2.Pos.Y then MinY:= Cell1.Pos.Y
+    else MinY := Cell2.Pos.Y;
+  DX := Cell2.Pos.X - Cell1.Pos.X;
+  DY := Cell2.Pos.Y - Cell1.Pos.Y;
   Result := (Abs(DX) <= 1) and (Abs(DY) <= 1) and
   ((((MinY mod 2) = 1) and
@@ -192 +192 @@
 procedure TPlayer.SelectCell(Pos: TPoint);
 var
-  NewSelectedCell: TPoint;
+  NewSelectedCell: TCell;
 begin
   NewSelectedCell := Game.Map.PosToCell(Pos, View, ViewZoom);
-  if (NewSelectedCell.X >= 0) and (NewSelectedCell.X < Game.Map.Size.X) and
-    (NewSelectedCell.Y >= 0) and (NewSelectedCell.Y < Game.Map.Size.Y) then begin
-    if IsCellsNeighbor(NewSelectedCell, SelectedCell) then begin
-      Game.SetMove(TCell(Game.Map.Cells[SelectedCell.Y, SelectedCell.X]),
-        TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]));
-      SelectedCell := Point(-1, -1);
+  if Assigned(NewSelectedCell) then begin
+    if Assigned(SelectedCell) and IsCellsNeighbor(NewSelectedCell, SelectedCell) then begin
+      Game.SetMove(SelectedCell, NewSelectedCell);
+      SelectedCell := nil;
     end else
-    if (NewSelectedCell.X <> SelectedCell.X) and (NewSelectedCell.Y <> SelectedCell.Y) and
-      (TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]).Player = Self) then
+    if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.Player = Self) then
       SelectedCell := NewSelectedCell
     else
-    if (NewSelectedCell.X = SelectedCell.X) and (NewSelectedCell.Y = SelectedCell.Y) and
-      (TCell(Game.Map.Cells[NewSelectedCell.Y, NewSelectedCell.X]).Player = Self) then
-        SelectedCell := Point(-1, -1);
+    if (NewSelectedCell = SelectedCell) and (NewSelectedCell.Player = Self) then
+      SelectedCell := nil;
   end;
 end;
@@ -220 +216 @@
 begin
   ViewZoom := 1;
-  SelectedCell := Point(-1, -1);
+  SelectedCell := nil;
 end;
 
@@ -349 +345 @@
   for I := 0 to Players.Count - 1 do
   with TPlayer(Players[I]) do begin
+    SelectedCell := nil;
     StartCell := Map.Cells[Random(Map.Size.Y), Random(Map.Size.X)];
     StartCell.Terrain := ttNormal;
@@ -378 +375 @@
   C: Integer;
 begin
-  // Free previous
-  for Y := 0 to FSize.Y - 1 do
-  for X := 0 to FSize.X - 1 do begin
-    Cells[Y, X].Destroy;
-  end;
-  FSize := AValue;
-  // Allocate and init new
-  SetLength(Cells, FSize.X, FSize.Y);
-  for Y := 0 to FSize.Y - 1 do
-  for X := 0 to FSize.X - 1 do begin
-    NewCell := TCell.Create;
-    NewCell.Pos := Point(X, Y);
-    Cells[Y, X] := NewCell;
-  end;
-end;
-
-function THexMap.PosToCell(Pos: TPoint; Rect: TRect; Zoom: Double): TPoint;
+  if (FSize.X <> AValue.X) or (FSize.Y <> AValue.Y) then begin
+    // Free previous
+    for Y := 0 to FSize.Y - 1 do
+    for X := 0 to FSize.X - 1 do begin
+      Cells[Y, X].Destroy;
+    end;
+    FSize := AValue;
+    // Allocate and init new
+    SetLength(Cells, FSize.X, FSize.Y);
+    for Y := 0 to FSize.Y - 1 do
+    for X := 0 to FSize.X - 1 do begin
+      NewCell := TCell.Create;
+      NewCell.Pos := Point(X, Y);
+      Cells[Y, X] := NewCell;
+    end;
+  end;
+end;
+
+function THexMap.PosToCell(Pos: TPoint; Rect: TRect; Zoom: Double): TCell;
 var
   CX, CY: Integer;
@@ -402 +401 @@
   Points: array of TPoint;
 begin
+  Result := nil;
   CellSize := FloatPoint(DefaultCellSize.X / 1.15 * Zoom, DefaultCellSize.Y / 1.35 * Zoom);
   HexSize := FloatPoint(DefaultCellSize.X * Zoom, DefaultCellSize.Y * Zoom);
@@ -417 +417 @@
           Trunc(Y * CellSize.Y - Frac(Rect.Top / CellSize.Y) * CellSize.Y)), Point(Trunc(HexSize.X), Trunc(HexSize.Y)));
         if PtInPoly(Points, Pos) then begin
-          Result := Point(CX, CY);
+          Result := Cells[CY, CX];
           Exit;
         end;
@@ -446 +446 @@
 
 
-procedure THexMap.Paint(Canvas: TCanvas; Rect: TRect; Zoom: Double; SelectedCell: TPoint);
+procedure THexMap.Paint(Canvas: TCanvas; Rect: TRect; Zoom: Double; SelectedCell: TCell);
 var
   CX, CY: Integer;
@@ -494 +494 @@
         Cell := Cells[CY, CX];
         if Cell.Terrain = ttNormal then begin
-          if (SelectedCell.X = CX) and (SelectedCell.Y = CY) then Brush.Color := clGreen
-            else if IsCellsNeighbor(SelectedCell, Point(CX, CY)) then Brush.Color := clPurple
+          if Assigned(SelectedCell) and (SelectedCell = TCell(Cells[CY, CX])) then Brush.Color := clGreen
+            else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, TCell(Cells[CY, CX])) then Brush.Color := clPurple
             else Brush.Color := Cell.GetColor;
           Pen.Color := clBlack;