Changeset 14

Timestamp:

Oct 5, 2019, 11:42:10 AM (5 years ago)

Author:

chronos

Message:

• Fixed: Correct placement of numbers inside cells.

Location:

trunk

Files:

• Languages/Game2048.cs.mo (modified) ( previous)
• Languages/Game2048.cs.po (modified) (1 diff)
• Languages/Game2048.po (modified) (1 diff)
• UGame.pas (modified) (8 diffs)

trunk/Languages/Game2048.cs.po

@@ -134 +134 @@
 msgstr "Konec hry!"
 
+#: ugame.sscore
+msgid "Score"
+msgstr "Skóre"
+
+#: ugame.stopscore
+msgid "Top score"
+msgstr "Nejvyšší skóre"
+
 #: ugame.swincaption
 msgid "Win"

trunk/Languages/Game2048.po

@@ -124 +124 @@
 msgstr ""
 
+#: ugame.sscore
+msgid "Score"
+msgstr ""
+
+#: ugame.stopscore
+msgid "Top score"
+msgstr ""
+
 #: ugame.swincaption
 msgid "Win"

trunk/UGame.pas

@@ -42 +42 @@
     procedure DoChange;
     procedure ClearMerged;
+    procedure RenderCell(Canvas: TCanvas; Cell: TCell; CellRect: TRect);
   public
     Cells: array of array of TCell;
@@ -79 +80 @@
   SWinCaption = 'Win';
   SWinMessage = 'You won! Do you want to continue to play?';
-
+  SScore = 'Score';
+  STopScore = 'Top score';
 
 implementation
@@ -248 +250 @@
   Frame: TRect;
   CellRect: TRect;
-  TextSize: TSize;
   TopBarHeight: Integer;
   CellMargin: Integer;
@@ -258 +259 @@
   Canvas.FillRect(0, 0, Canvas.Width, Canvas.Height);
 
-  ValueStr := 'Score: ' + IntToStr(Score);
+  ValueStr := SScore + ': ' + IntToStr(Score);
   Canvas.Font.Color := clWhite;
   Canvas.Font.Height := Trunc(TopBarHeight * 0.7);
   Canvas.TextOut(ScaleY(16, 96), (TopBarHeight - Canvas.TextHeight(ValueStr)) div 2, ValueStr);
 
-  ValueStr := 'Top score: ' + IntToStr(TopScore);
+  ValueStr := STopScore + ': ' + IntToStr(TopScore);
   Canvas.Font.Color := clWhite;
   Canvas.Font.Height := Trunc(TopBarHeight * 0.7);
@@ -279 +280 @@
     Frame.Top + Frame.Height div 2 + (Size.Y * CellSize.Y) div 2);
 
-  {  for Y := 0 to Size.Y - 1 do begin
-    Canvas.MoveTo(Frame.Left, Frame.Top + Y * CellSize.Y);
-    Canvas.LineTo(Frame.Left + Size.X * CellSize.X, Frame.Top + Y * CellSize.Y);
-  end;
-  for X := 0 to Size.X - 1 do begin
-    Canvas.MoveTo(Frame.Left + X * CellSize.X, Frame.Top);
-    Canvas.LineTo(Frame.Left + X * CellSize.X, Frame.Top + Size.Y * CellSize.Y);
-  end;
-  }
   Canvas.Brush.Style := bsSolid;
   Canvas.Brush.Color := clGray;
@@ -293 +285 @@
 
   Canvas.Font.Color := clBlack;
+
   // Draw static cells
   for Y := 0 to Size.Y - 1 do
@@ -303 +296 @@
         Frame.Top + Y * CellSize.Y + CellMargin,
         CellSize.X - 2 * CellMargin, CellSize.Y - 2 * CellMargin);
-      Canvas.FillRect(CellRect);
-      if (Cells[Y, X].Value <> 0) and not Cells[Y, X].Moving then begin
-        ValueStr := IntToStr(Cells[Y, X].Value);
-        Canvas.Brush.Style := bsClear;
-        Canvas.Font.Height := Trunc(CellSize.Y * 0.7); // * (CellSize.X * 0.7) / Canvas.TextWidth(ValueStr));
-        TextSize := Canvas.TextExtent(ValueStr);
-        if TextSize.Width > CellSize.X then
-          Canvas.Font.Height := Trunc(Canvas.Font.Height / TextSize.Width * CellSize.X);
-        TextSize := Canvas.TextExtent(ValueStr);
-        Canvas.TextOut(CellRect.Left + CellSize.X div 2 -
-          TextSize.Width div 2,
-          CellRect.Top + CellSize.Y div 2 - TextSize.Height div 2, ValueStr);
-      end;
+      RenderCell(Canvas, Cells[Y, X], CellRect);
     end;
 
@@ -328 +309 @@
         Frame.Top + Y * CellSize.Y + Trunc(Cells[Y, X].Shift.Y / 100 * CellSize.Y + CellMargin),
         CellSize.X - 2 * CellMargin, CellSize.Y - 2 * CellMargin);
-      Canvas.FillRect(CellRect);
-      if Cells[Y, X].Value <> 0 then begin
-        ValueStr := IntToStr(Cells[Y, X].Value);
-        Canvas.Brush.Style := bsClear;
-        Canvas.Font.Height := Trunc(CellSize.Y * 0.7); // * (CellSize.X * 0.7) / Canvas.TextWidth(ValueStr));
-        TextSize := Canvas.TextExtent(ValueStr);
-        if TextSize.Width > CellRect.Width then
-          Canvas.Font.Height := Trunc(Canvas.Font.Height / TextSize.Width * CellSize.X);
-        TextSize := Canvas.TextExtent(ValueStr);
-        Canvas.TextOut(CellRect.Left + CellRect.Width div 2 -
-          TextSize.Width div 2,
-          CellRect.Top + CellRect.Height div 2 - TextSize.Height div 2, ValueStr);
-      end;
-    end;
-end;
+      RenderCell(Canvas, Cells[Y, X], CellRect);
+    end;
+end;
+
+procedure TGame.RenderCell(Canvas: TCanvas; Cell: TCell; CellRect: TRect);
+var
+  ValueStr: string;
+  TextSize: TSize;
+begin
+  Canvas.FillRect(CellRect);
+  if Cell.Value <> 0 then begin
+    ValueStr := IntToStr(Cell.Value);
+    Canvas.Brush.Style := bsClear;
+    Canvas.Font.Height := Trunc(CellRect.Height * 0.7);
+    TextSize := Canvas.TextExtent(ValueStr);
+    if TextSize.Width > CellRect.Width then
+      Canvas.Font.Height := Trunc(Canvas.Font.Height / TextSize.Width * CellRect.Width);
+    TextSize := Canvas.TextExtent(ValueStr);
+    Canvas.TextOut(CellRect.Left + CellRect.Width div 2 - TextSize.Width div 2,
+      CellRect.Top + CellRect.Height div 2 - TextSize.Height div 2, ValueStr);
+  end;
+end;
+
 
 function TGame.MoveAll(Direction: TDirection): Integer;