Changeset 10 for trunk/UGame.pas

Timestamp:

Oct 4, 2019, 11:05:35 PM (5 years ago)

Author:

chronos

Message:

• Added: Show Top score and remember it after application restart.

File:

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

trunk/UGame.pas

@@ -32 +32 @@
     FOnChange: TNotifyEvent;
     FRunning: Boolean;
+    FScore: Integer;
     FSize: TPoint;
     function GetCellColor(Value: Integer): TColor;
+    procedure SetScore(AValue: Integer);
     procedure SetSize(AValue: TPoint);
     procedure GetEmptyCells(EmptyCells: TCells);
     procedure DoChange;
     procedure ClearMerged;
-    function GetScore: Integer;
   public
     Cells: array of array of TCell;
+    TopScore: Integer;
     procedure GameOver;
     function FillRandomCell: Integer;
@@ -54 +56 @@
     constructor Create;
     destructor Destroy; override;
-    property Score: Integer read GetScore;
+    property Score: Integer read FScore write SetScore;
     property Size: TPoint read FSize write SetSize;
     property Running: Boolean read FRunning write FRunning;
@@ -187 +189 @@
 begin
   Clear;
+  Score := 0;
   Running := True;
   for I := 0 to 1 do FillRandomCell;
@@ -222 +225 @@
   Canvas.Font.Height := Trunc(TopBarHeight * 0.7);
   Canvas.TextOut(ScaleY(16, 96), (TopBarHeight - Canvas.TextHeight(ValueStr)) div 2, ValueStr);
+
+  ValueStr := 'Top score: ' + IntToStr(TopScore);
+  Canvas.Font.Color := clWhite;
+  Canvas.Font.Height := Trunc(TopBarHeight * 0.7);
+  Canvas.TextOut(ScaleY(106, 96), (TopBarHeight - Canvas.TextHeight(ValueStr)) div 2, ValueStr);
 
   // Form.Canvas.Width and Form.Canvas.Height is not working correctly under Windows.
@@ -377 +385 @@
               Cells[P.Y, P.X].Merged := False;
               Inc(MovedCount);
+              Score := Score + Cells[PNew.Y, PNew.X].NewValue;
             end;
           end;
@@ -421 +430 @@
   Result := (Pos.X >= 0) and (Pos.X < FSize.X) and
     (Pos.Y >= 0) and (Pos.Y < FSize.Y);
-end;
-
-function TGame.GetScore: Integer;
-var
-  X, Y: Integer;
-begin
-  Result := 0;
-  for Y := 0 to Size.Y - 1 do
-    for X := 0 to Size.X - 1 do
-      Result := Result + Cells[Y, X].Value;
 end;
 
@@ -462 +461 @@
 end;
 
+procedure TGame.SetScore(AValue: Integer);
+begin
+  if FScore = AValue then Exit;
+  FScore := AValue;
+  if FScore > TopScore then TopScore := FScore;
+end;
+
 end.