Changeset 709 for trunk/LocalPlayer/Battle.pas

Timestamp:

Aug 21, 2025, 11:37:30 PM (5 hours ago)

Author:

chronos

Message:

• Added: Enter key confirms battle dialog window.
• Fixed: Potential battle dialog drawing issue.
• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Battle.pas (modified) (8 diffs)

trunk/LocalPlayer/Battle.pas

@@ -66 +66 @@
   MaxBar := 65;
 
-  // TerrType:=MyMap[ToLoc] and fTerrain;
+  // TerrType := MyMap[ToLoc] and fTerrain;
   GetUnitInfo(ToLoc, euix, UnitInfo);
 
@@ -171 +171 @@
   UnshareBitmap(Buffer);
   BitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4, ym - 8 - 12 - 48);
-  { if TerrType<fForest then
-    Sprite(Buffer,HGrTerrain,0,16,66,32,1+TerrType*(xxt*2+1),1+yyt)
+  { if TerrType < fForest then
+    Sprite(Buffer, HGrTerrain, 0, 16, 66, 32, 1 + TerrType * (xxt * 2 + 1), 1 + yyt)
     else
     begin
-    Sprite(Buffer,HGrTerrain,0,16,66,32,1+2*(xxt*2+1),1+yyt+2*(yyt*3+1));
-    if (TerrType=fForest) and IsJungle(ToLoc div G.lx) then
-    Sprite(Buffer,HGrTerrain,0,16,66,32,1+7*(xxt*2+1),1+yyt+19*(yyt*3+1))
-    else Sprite(Buffer,HGrTerrain,0,16,66,32,1+7*(xxt*2+1),1+yyt+2*(2+TerrType-fForest)*(yyt*3+1));
+      Sprite(Buffer, HGrTerrain, 0, 16, 66, 32, 1 + 2 * (xxt * 2 + 1), 1 + yyt + 2 * (yyt * 3 + 1));
+      if (TerrType = fForest) and IsJungle(ToLoc div G.lx) then
+      Sprite(Buffer, HGrTerrain, 0, 16, 66, 32, 1 + 7 * (xxt * 2 + 1), 1+ yyt + 19 * (yyt * 3 + 1))
+      else Sprite(Buffer, HGrTerrain, 0, 16, 66, 32, 1 + 7 * (xxt * 2 + 1), 1 + yyt + 2 * (2 + TerrType - fForest) * (yyt * 3 + 1));
     end; }
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
@@ -201 +201 @@
 procedure TBattleDlg.FormShow(Sender: TObject);
 begin
-  if IsSuicideQuery then
-  begin
-    ClientWidth := 300;
-    ClientHeight := 288;
+  if IsSuicideQuery then begin
+    BoundsRect := Bounds(0, 0, 300, 288);
     OKBtn.Visible := True;
     CancelBtn.Visible := True;
     CenterToScreen;
-  end
-  else
-  begin
-    ClientWidth := 178;
-    ClientHeight := 178;
+  end else begin
+    BoundsRect := Bounds(0, 0, 178, 178);
     OKBtn.Visible := False;
     CancelBtn.Visible := False;
@@ -226 +221 @@
   begin
     Brush.Color := 0;
-    FillRect(Rect(0, 0, ClientWidth, ClientHeight));
+    FillRect(Rect(0, 0, Width, Height));
     Brush.Style := TBrushStyle.bsClear;
     PaintBackground(Canvas, 3 + Border, 3 + Border,
-      ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border),
-      ClientWidth, ClientHeight);
-  end;
-  Frame(Canvas, Border + 1, Border + 1, ClientWidth - (2 + Border),
-    ClientHeight - (2 + Border), MainTexture.ColorBevelLight,
+      Width - (6 + 2 * Border), Height - (6 + 2 * Border),
+      Width, Height);
+  end;
+  Frame(Canvas, Border + 1, Border + 1, Width - (2 + Border),
+    Height - (2 + Border), MainTexture.ColorBevelLight,
     MainTexture.ColorBevelShade);
-  Frame(Canvas, 2 + Border, 2 + Border, ClientWidth - (3 + Border),
-    ClientHeight - (3 + Border), MainTexture.ColorBevelLight,
+  Frame(Canvas, 2 + Border, 2 + Border, Width - (3 + Border),
+    Height - (3 + Border), MainTexture.ColorBevelLight,
     MainTexture.ColorBevelShade);
 
@@ -243 +238 @@
     Canvas.Font.Assign(UniFont[ftCaption]);
     S := Phrases.Lookup('TITLE_SUICIDE');
-    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
+    RisedTextOut(Canvas, (Width - BiColorTextWidth(Canvas, S)) div 2,
       7 + Border, S);
     Canvas.Font.Assign(UniFont[ftNormal]);
@@ -249 +244 @@
     P := Pos('\', S);
     if P = 0 then
-      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S))
-        div 2, 205, S)
+      RisedTextOut(Canvas, (Width - BiColorTextWidth(Canvas, S)) div 2, 205, S)
     else
     begin
       s1 := Copy(S, 1, P - 1);
-      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
+      RisedTextOut(Canvas, (Width - BiColorTextWidth(Canvas, s1)) div 2,
         205 - MessageLineSpacing div 2, s1);
       s1 := Copy(S, P + 1, 255);
-      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
+      RisedTextOut(Canvas, (Width - BiColorTextWidth(Canvas, s1)) div 2,
         205 + (MessageLineSpacing - MessageLineSpacing div 2), s1);
     end;
@@ -263 +257 @@
   end
   else
-    ym := ClientHeight div 2;
+    ym := Height div 2;
   Canvas.Font.Assign(UniFont[ftSmall]);
-  PaintBattleOutcome(Canvas, ClientWidth div 2, ym, uix, ToLoc, Forecast);
+  PaintBattleOutcome(Canvas, Width div 2, ym, uix, ToLoc, Forecast);
 
   for cix := 0 to ControlCount - 1 do
@@ -293 +287 @@
   Shift: TShiftState);
 begin
+  if Key = VK_RETURN then OKBtnClick(Self)
+  else
   if not IsSuicideQuery and (Key <> VK_SHIFT) then
   begin