Changeset 105

Timestamp:

Dec 30, 2014, 11:16:07 AM (10 years ago)

Author:

chronos

Message:

• Modified: Do not show zero on empty cells.
• Modified: Shift + mouse click emove existing cell moves and move all cell units.

Location:

trunk

Files:

• UGame.pas (modified) (2 diffs)
• xtactics.lpi (modified) (5 diffs)

trunk/UGame.pas

@@ -1302 +1302 @@
 
     // Show cell text
-    Pen.Style := psSolid;
-    Font.Color := clWhite;
-    Brush.Style := bsClear;
-    Font.Size := Trunc(42 * View.Zoom);
-    TextPos := View.CellToCanvasPos(Pos);
-    TextSize := TextExtent(Text);
-    TCanvasEx(Canvas).TextOutEx(Round(TextPos.X) - TextSize.cx div 2,
-      Round(TextPos.Y) - TextSize.cy div 2, Text, False);
+    if Text <> '0' then begin
+      Pen.Style := psSolid;
+      Font.Color := clWhite;
+      Brush.Style := bsClear;
+      Font.Size := Trunc(42 * View.Zoom);
+      TextPos := View.CellToCanvasPos(Pos);
+      TextSize := TextExtent(Text);
+      TCanvasEx(Canvas).TextOutEx(Round(TextPos.X) - TextSize.cx div 2,
+        Round(TextPos.Y) - TextSize.cy div 2, Text, False);
+    end;
   end;
 end;
@@ -2103 +2105 @@
       if ssShift in ShiftState then begin
         // Make maximum unit move without confirmation dialog
+        for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
+          TUnitMove(SelectedCell.MovesFrom[I]).Free;
         Game.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power, False);
         SelectedCell := nil;

trunk/xtactics.lpi

@@ -121 +121 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormPlayer"/>
       </Unit3>
       <Unit4>
@@ -145 +144 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormMove"/>
       </Unit6>
       <Unit7>
@@ -153 +151 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormNew"/>
       </Unit7>
       <Unit8>
@@ -161 +158 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormAbout"/>
       </Unit8>
       <Unit9>
@@ -169 +165 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormHelp"/>
       </Unit9>
       <Unit10>
         <Filename Value="UMap.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UMap"/>
       </Unit10>
     </Units>