Changeset 6 for trunk/LocalPlayer/Battle.pas

Timestamp:

Jan 7, 2017, 11:32:14 AM (7 years ago)

Author:

chronos

Message:

• Modified: Formated all project source files using Delphi formatter as original indentation and other formatting was really bad.

File:

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

trunk/LocalPlayer/Battle.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools,Protocol,Messg,ButtonBase, ButtonA,
+  ScreenTools, Protocol, Messg, ButtonBase, ButtonA,
 
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms;
@@ -17 +17 @@
       Shift: TShiftState; X, Y: Integer);
     procedure FormDeactivate(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -24 +23 @@
     procedure CancelBtnClick(Sender: TObject);
   public
-    uix,ToLoc: integer;
+    uix, ToLoc: Integer;
     Forecast: TBattleForecastEx;
     IsSuicideQuery: boolean;
@@ -32 +31 @@
   BattleDlg: TBattleDlg;
 
-procedure PaintBattleOutcome(ca: TCanvas; xm,ym,uix,ToLoc: integer;
+procedure PaintBattleOutcome(ca: TCanvas; xm, ym, uix, ToLoc: Integer;
   Forecast: TBattleForecastEx);
 
-
 implementation
 
 uses
-Term,ClientTools,IsoEngine;
+  Term, ClientTools, IsoEngine;
 
 {$R *.DFM}
 
 const
-Border=3;
-MessageLineSpacing=20;
-
-DamageColor=$0000E0;
-FanaticColor=$800080;
-FirstStrikeColor=$A0A0A0;
-
-
-procedure PaintBattleOutcome(ca: TCanvas; xm,ym,uix,ToLoc: integer;
+  Border = 3;
+  MessageLineSpacing = 20;
+
+  DamageColor = $0000E0;
+  FanaticColor = $800080;
+  FirstStrikeColor = $A0A0A0;
+
+procedure PaintBattleOutcome(ca: TCanvas; xm, ym, uix, ToLoc: Integer;
   Forecast: TBattleForecastEx);
 var
-euix,ADamage,DDamage,StrMax,DamageMax,MaxBar,LAStr,LDStr,
-  LADamage,LDDamage,LABaseDamage,LAAvoidedDamage,LDBaseDamage: integer;
-//TerrType: Cardinal;
-UnitInfo: TUnitInfo;
-TextSize: TSize;
-LabelText: string;
-FirstStrike: boolean;
-begin
-MaxBar:=65;
-
-//TerrType:=MyMap[ToLoc] and fTerrain;
-GetUnitInfo(ToLoc,euix,UnitInfo);
-
-FirstStrike:=(MyModel[MyUn[uix].mix].Cap[mcFirst]>0)
-  and (Forecast.DBaseDamage>=UnitInfo.Health);
-ADamage:=MyUn[uix].Health-Forecast.EndHealthAtt;
-if FirstStrike then
-  ADamage:=ADamage+Forecast.ABaseDamage div 2;
-DDamage:=UnitInfo.Health-Forecast.EndHealthDef;
-if Forecast.AStr>Forecast.DStr then
-  StrMax:=Forecast.AStr
-else StrMax:=Forecast.DStr;
-if ADamage>DDamage then
-  DamageMax:=ADamage
-else DamageMax:=DDamage;
-if Forecast.ABaseDamage>Forecast.DBaseDamage then
-  StrMax:=StrMax*DamageMax div Forecast.ABaseDamage
-else StrMax:=StrMax*DamageMax div Forecast.DBaseDamage;
-
-LAStr:=Forecast.AStr*MaxBar div StrMax;
-LDStr:=Forecast.DStr*MaxBar div StrMax;
-LADamage:=ADamage*MaxBar div DamageMax;
-LABaseDamage:=Forecast.ABaseDamage*MaxBar div DamageMax;
-if FirstStrike then
-  LAAvoidedDamage:=LABaseDamage div 2
-else LAAvoidedDamage:=0;
-LDDamage:=DDamage*MaxBar div DamageMax;
-LDBaseDamage:=Forecast.DBaseDamage*MaxBar div DamageMax;
-
-DarkGradient(ca,xm-8-LAStr,ym-8,LAStr,2);
-VDarkGradient(ca,xm-8,ym-8-LDStr,LDStr,2);
-LightGradient(ca,xm+8,ym-8,LDBaseDamage,DamageColor);
-if LDDamage>LDBaseDamage then
-  LightGradient(ca,xm+8+LDBaseDamage,ym-8,LDDamage-LDBaseDamage,FanaticColor);
-if LAAvoidedDamage>0 then
-  VLightGradient(ca,xm-8,ym+8,LAAvoidedDamage,FirstStrikeColor);
-VLightGradient(ca,xm-8,ym+8+LAAvoidedDamage,LABaseDamage-LAAvoidedDamage,
-  DamageColor);
-if LADamage>LABaseDamage then
-  VLightGradient(ca,xm-8,ym+8+LABaseDamage,LADamage-LABaseDamage,FanaticColor);
-BitBlt(ca.Handle,xm-12,ym-12,24,24,
-  GrExt[HGrSystem].Mask.Canvas.Handle,26,146,SRCAND);
-BitBlt(ca.Handle,xm-12,ym-12,24,24,
-  GrExt[HGrSystem].Data.Canvas.Handle,26,146,SRCPAINT);
-
-LabelText:=Format('%d', [Forecast.AStr]);
-TextSize:=ca.TextExtent(LabelText);
-if TextSize.cx div 2+2>LAStr div 2 then
-  RisedTextOut(ca,xm-10-TextSize.cx,ym-(TextSize.cy+1) div 2, LabelText)
-else RisedTextOut(ca,xm-8-(LAStr+TextSize.cx) div 2,ym-(TextSize.cy+1) div 2, LabelText);
-
-LabelText:=Format('%d', [Forecast.DStr]);
-TextSize:=ca.TextExtent(LabelText);
-if TextSize.cy div 2>LDStr div 2 then
-  RisedTextOut(ca,xm-(TextSize.cx+1) div 2, ym-8-TextSize.cy,LabelText)
-else RisedTextOut(ca,xm-(TextSize.cx+1) div 2, ym-8-(LDStr+TextSize.cy) div 2,LabelText);
-
-if Forecast.EndHealthDef<=0 then
-  begin
-  BitBlt(ca.Handle,xm+9+LDDamage-7,ym-6,14,17,
-    GrExt[HGrSystem].Mask.Canvas.Handle,51,153,SRCAND);
-  BitBlt(ca.Handle,xm+8+LDDamage-7,ym-7,14,17,
-    GrExt[HGrSystem].Mask.Canvas.Handle,51,153,SRCAND);
-  BitBlt(ca.Handle,xm+8+LDDamage-7,ym-7,14,17,
-    GrExt[HGrSystem].Data.Canvas.Handle,51,153,SRCPAINT);
-  end;
-LabelText:=Format('%d', [DDamage]);
-TextSize:=ca.TextExtent(LabelText);
-if TextSize.cx div 2+2>LDDamage div 2 then
-  begin
-  if Forecast.EndHealthDef>0 then
-    RisedTextOut(ca,xm+10,ym-(TextSize.cy+1) div 2, LabelText)
-  end
-else RisedTextOut(ca,xm+8+(LDDamage-TextSize.cx) div 2,ym-(TextSize.cy+1) div 2, LabelText);
-
-if Forecast.EndHealthAtt<=0 then
-  begin
-  BitBlt(ca.Handle,xm-6,ym+9+LADamage-7,14,17,
-    GrExt[HGrSystem].Mask.Canvas.Handle,51,153,SRCAND);
-  BitBlt(ca.Handle,xm-7,ym+8+LADamage-7,14,17,
-    GrExt[HGrSystem].Mask.Canvas.Handle,51,153,SRCAND);
-  BitBlt(ca.Handle,xm-7,ym+8+LADamage-7,14,17,
-    GrExt[HGrSystem].Data.Canvas.Handle,51,153,SRCPAINT);
-  end;
-LabelText:=Format('%d', [MyUn[uix].Health-Forecast.EndHealthAtt]);
-TextSize:=ca.TextExtent(LabelText);
-if TextSize.cy div 2>(LADamage-LAAvoidedDamage) div 2+LAAvoidedDamage then
-  begin
-  if Forecast.EndHealthAtt>0 then
-    RisedTextOut(ca,xm-(TextSize.cx+1) div 2, ym+8+LAAvoidedDamage,LabelText)
-  end
-else RisedTextOut(ca,xm-(TextSize.cx+1) div 2, ym+8+LAAvoidedDamage+(LADamage-LAAvoidedDamage-TextSize.cy) div 2,LabelText);
-
-NoMap.SetOutput(Buffer);
-BitBlt(Buffer.Canvas.Handle,0,0,66,48,ca.Handle,xm+8+4,ym-8-12-48,SRCCOPY);
-{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
+  euix, ADamage, DDamage, StrMax, DamageMax, MaxBar, LAStr, LDStr, LADamage,
+    LDDamage, LABaseDamage, LAAvoidedDamage, LDBaseDamage: Integer;
+  // TerrType: Cardinal;
+  UnitInfo: TUnitInfo;
+  TextSize: TSize;
+  LabelText: string;
+  FirstStrike: boolean;
+begin
+  MaxBar := 65;
+
+  // TerrType:=MyMap[ToLoc] and fTerrain;
+  GetUnitInfo(ToLoc, euix, UnitInfo);
+
+  FirstStrike := (MyModel[MyUn[uix].mix].Cap[mcFirst] > 0) and
+    (Forecast.DBaseDamage >= UnitInfo.Health);
+  ADamage := MyUn[uix].Health - Forecast.EndHealthAtt;
+  if FirstStrike then
+    ADamage := ADamage + Forecast.ABaseDamage div 2;
+  DDamage := UnitInfo.Health - Forecast.EndHealthDef;
+  if Forecast.AStr > Forecast.DStr then
+    StrMax := Forecast.AStr
+  else
+    StrMax := Forecast.DStr;
+  if ADamage > DDamage then
+    DamageMax := ADamage
+  else
+    DamageMax := DDamage;
+  if Forecast.ABaseDamage > Forecast.DBaseDamage then
+    StrMax := StrMax * DamageMax div Forecast.ABaseDamage
+  else
+    StrMax := StrMax * DamageMax div Forecast.DBaseDamage;
+
+  LAStr := Forecast.AStr * MaxBar div StrMax;
+  LDStr := Forecast.DStr * MaxBar div StrMax;
+  LADamage := ADamage * MaxBar div DamageMax;
+  LABaseDamage := Forecast.ABaseDamage * MaxBar div DamageMax;
+  if FirstStrike then
+    LAAvoidedDamage := LABaseDamage div 2
+  else
+    LAAvoidedDamage := 0;
+  LDDamage := DDamage * MaxBar div DamageMax;
+  LDBaseDamage := Forecast.DBaseDamage * MaxBar div DamageMax;
+
+  DarkGradient(ca, xm - 8 - LAStr, ym - 8, LAStr, 2);
+  VDarkGradient(ca, xm - 8, ym - 8 - LDStr, LDStr, 2);
+  LightGradient(ca, xm + 8, ym - 8, LDBaseDamage, DamageColor);
+  if LDDamage > LDBaseDamage then
+    LightGradient(ca, xm + 8 + LDBaseDamage, ym - 8, LDDamage - LDBaseDamage,
+      FanaticColor);
+  if LAAvoidedDamage > 0 then
+    VLightGradient(ca, xm - 8, ym + 8, LAAvoidedDamage, FirstStrikeColor);
+  VLightGradient(ca, xm - 8, ym + 8 + LAAvoidedDamage,
+    LABaseDamage - LAAvoidedDamage, DamageColor);
+  if LADamage > LABaseDamage then
+    VLightGradient(ca, xm - 8, ym + 8 + LABaseDamage, LADamage - LABaseDamage,
+      FanaticColor);
+  BitBlt(ca.Handle, xm - 12, ym - 12, 24, 24,
+    GrExt[HGrSystem].Mask.Canvas.Handle, 26, 146, SRCAND);
+  BitBlt(ca.Handle, xm - 12, ym - 12, 24, 24,
+    GrExt[HGrSystem].Data.Canvas.Handle, 26, 146, SRCPAINT);
+
+  LabelText := Format('%d', [Forecast.AStr]);
+  TextSize := ca.TextExtent(LabelText);
+  if TextSize.cx div 2 + 2 > LAStr div 2 then
+    RisedTextOut(ca, xm - 10 - TextSize.cx, ym - (TextSize.cy + 1) div 2,
+      LabelText)
+  else
+    RisedTextOut(ca, xm - 8 - (LAStr + TextSize.cx) div 2,
+      ym - (TextSize.cy + 1) div 2, LabelText);
+
+  LabelText := Format('%d', [Forecast.DStr]);
+  TextSize := ca.TextExtent(LabelText);
+  if TextSize.cy div 2 > LDStr div 2 then
+    RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym - 8 - TextSize.cy,
+      LabelText)
+  else
+    RisedTextOut(ca, xm - (TextSize.cx + 1) div 2,
+      ym - 8 - (LDStr + TextSize.cy) div 2, LabelText);
+
+  if Forecast.EndHealthDef <= 0 then
+  begin
+    BitBlt(ca.Handle, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
+    BitBlt(ca.Handle, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
+    BitBlt(ca.Handle, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+      GrExt[HGrSystem].Data.Canvas.Handle, 51, 153, SRCPAINT);
+  end;
+  LabelText := Format('%d', [DDamage]);
+  TextSize := ca.TextExtent(LabelText);
+  if TextSize.cx div 2 + 2 > LDDamage div 2 then
+  begin
+    if Forecast.EndHealthDef > 0 then
+      RisedTextOut(ca, xm + 10, ym - (TextSize.cy + 1) div 2, LabelText)
+  end
+  else
+    RisedTextOut(ca, xm + 8 + (LDDamage - TextSize.cx) div 2,
+      ym - (TextSize.cy + 1) div 2, LabelText);
+
+  if Forecast.EndHealthAtt <= 0 then
+  begin
+    BitBlt(ca.Handle, xm - 6, ym + 9 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
+    BitBlt(ca.Handle, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
+    BitBlt(ca.Handle, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Data.Canvas.Handle, 51, 153, SRCPAINT);
+  end;
+  LabelText := Format('%d', [MyUn[uix].Health - Forecast.EndHealthAtt]);
+  TextSize := ca.TextExtent(LabelText);
+  if TextSize.cy div 2 > (LADamage - LAAvoidedDamage) div 2 + LAAvoidedDamage
+  then
+  begin
+    if Forecast.EndHealthAtt > 0 then
+      RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym + 8 + LAAvoidedDamage,
+        LabelText)
+  end
+  else
+    RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym + 8 + LAAvoidedDamage +
+      (LADamage - LAAvoidedDamage - TextSize.cy) div 2, LabelText);
+
+  NoMap.SetOutput(Buffer);
+  BitBlt(Buffer.Canvas.Handle, 0, 0, 66, 48, ca.Handle, xm + 8 + 4,
+    ym - 8 - 12 - 48, SRCCOPY);
+  { 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));
-  end;}
-NoMap.PaintUnit(1,0,UnitInfo,0);
-BitBlt(ca.Handle,xm+8+4,ym-8-12-48,66,48,Buffer.Canvas.Handle,0,0,SRCCOPY);
-
-BitBlt(Buffer.Canvas.Handle,0,0,66,48,ca.Handle,xm-8-4-66,ym+8+12,SRCCOPY);
-MakeUnitInfo(me,MyUn[uix],UnitInfo);
-UnitInfo.Flags:=UnitInfo.Flags and not unFortified;
-NoMap.PaintUnit(1,0,UnitInfo,0);
-BitBlt(ca.Handle,xm-8-4-66,ym+8+12,66,48,Buffer.Canvas.Handle,0,0,SRCCOPY);
-end; {PaintBattleOutcome}
-
+    else Sprite(Buffer,HGrTerrain,0,16,66,32,1+7*(xxt*2+1),1+yyt+2*(2+TerrType-fForest)*(yyt*3+1));
+    end; }
+  NoMap.PaintUnit(1, 0, UnitInfo, 0);
+  BitBlt(ca.Handle, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas.Handle,
+    0, 0, SRCCOPY);
+
+  BitBlt(Buffer.Canvas.Handle, 0, 0, 66, 48, ca.Handle, xm - 8 - 4 - 66,
+    ym + 8 + 12, SRCCOPY);
+  MakeUnitInfo(me, MyUn[uix], UnitInfo);
+  UnitInfo.Flags := UnitInfo.Flags and not unFortified;
+  NoMap.PaintUnit(1, 0, UnitInfo, 0);
+  BitBlt(ca.Handle, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas.Handle,
+    0, 0, SRCCOPY);
+end; { PaintBattleOutcome }
 
 procedure TBattleDlg.FormCreate(Sender: TObject);
 begin
-OKBtn.Caption:=Phrases.Lookup('BTN_YES');
-CancelBtn.Caption:=Phrases.Lookup('BTN_NO');
-InitButtons();
+  OKBtn.Caption := Phrases.Lookup('BTN_YES');
+  CancelBtn.Caption := Phrases.Lookup('BTN_NO');
+  InitButtons();
 end;
 
 procedure TBattleDlg.FormShow(Sender: TObject);
 begin
-if IsSuicideQuery then
-  begin
-  ClientWidth:=300;
-  ClientHeight:=288;
-  OKBtn.Visible:=true;
-  CancelBtn.Visible:=true;
-  Left:=(Screen.Width-ClientWidth) div 2; // center on screen
-  Top:=(Screen.Height-ClientHeight) div 2;
-  end
-else
-  begin
-  ClientWidth:=178;
-  ClientHeight:=178;
-  OKBtn.Visible:=false;
-  CancelBtn.Visible:=false;
+  if IsSuicideQuery then
+  begin
+    ClientWidth := 300;
+    ClientHeight := 288;
+    OKBtn.Visible := true;
+    CancelBtn.Visible := true;
+    Left := (Screen.Width - ClientWidth) div 2; // center on screen
+    Top := (Screen.Height - ClientHeight) div 2;
+  end
+  else
+  begin
+    ClientWidth := 178;
+    ClientHeight := 178;
+    OKBtn.Visible := false;
+    CancelBtn.Visible := false;
   end;
 end;
@@ -209 +227 @@
 procedure TBattleDlg.FormPaint(Sender: TObject);
 var
-ym,cix,p: integer;
-s,s1: string;
-begin
-with Canvas do
-  begin
-  Brush.Color:=0;
-  FillRect(Rect(0,0,ClientWidth,ClientHeight));
-  Brush.Style:=bsClear;
-  PaintBackground(self,3+Border,3+Border,ClientWidth-(6+2*Border),
-    ClientHeight-(6+2*Border))
-  end;
-Frame(Canvas,Border+1,Border+1,ClientWidth-(2+Border),ClientHeight-(2+Border),
-  MainTexture.clBevelLight,MainTexture.clBevelShade);
-Frame(Canvas,2+Border,2+Border,ClientWidth-(3+Border),ClientHeight-(3+Border),
-  MainTexture.clBevelLight,MainTexture.clBevelShade);
-
-if IsSuicideQuery then
-  begin
-  Canvas.Font.Assign(UniFont[ftCaption]);
-  s:=Phrases.Lookup('TITLE_SUICIDE');
-  RisedTextout(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s)) div 2, 7+Border, s);
-  Canvas.Font.Assign(UniFont[ftNormal]);
-  s:=Phrases.Lookup('SUICIDE');
-  p:=pos('\',s);
-  if p=0 then
-    RisedTextout(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s)) div 2, 205, s)
-  else
+  ym, cix, p: Integer;
+  s, s1: string;
+begin
+  with Canvas do
+  begin
+    Brush.Color := 0;
+    FillRect(Rect(0, 0, ClientWidth, ClientHeight));
+    Brush.Style := bsClear;
+    PaintBackground(self, 3 + Border, 3 + Border,
+      ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border))
+  end;
+  Frame(Canvas, Border + 1, Border + 1, ClientWidth - (2 + Border),
+    ClientHeight - (2 + Border), MainTexture.clBevelLight,
+    MainTexture.clBevelShade);
+  Frame(Canvas, 2 + Border, 2 + Border, ClientWidth - (3 + Border),
+    ClientHeight - (3 + Border), MainTexture.clBevelLight,
+    MainTexture.clBevelShade);
+
+  if IsSuicideQuery then
+  begin
+    Canvas.Font.Assign(UniFont[ftCaption]);
+    s := Phrases.Lookup('TITLE_SUICIDE');
+    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
+      7 + Border, s);
+    Canvas.Font.Assign(UniFont[ftNormal]);
+    s := Phrases.Lookup('SUICIDE');
+    p := pos('\', s);
+    if p = 0 then
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
+        div 2, 205, s)
+    else
     begin
-    s1:=copy(s,1,p-1);
-    RisedTextout(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s1)) div 2,
-      205-MessageLineSpacing div 2, s1);
-    s1:=copy(s,p+1,255);
-    RisedTextout(Canvas,(ClientWidth-BiColorTextWidth(Canvas,s1)) div 2,
-      205+(MessageLineSpacing-MessageLineSpacing div 2), s1);
+      s1 := copy(s, 1, p - 1);
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
+        205 - MessageLineSpacing div 2, s1);
+      s1 := copy(s, p + 1, 255);
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
+        205 + (MessageLineSpacing - MessageLineSpacing div 2), s1);
     end;
-  ym:=110
-  end
-else ym:=ClientHeight div 2;
-Canvas.Font.Assign(UniFont[ftSmall]);
-PaintBattleOutcome(Canvas, ClientWidth div 2, ym, uix, ToLoc, Forecast);
-
-for cix:=0 to ControlCount-1 do
-  if (Controls[cix].Visible) and (Controls[cix] is TButtonBase) then
-    BtnFrame(Canvas,Controls[cix].BoundsRect,MainTexture);
+    ym := 110
+  end
+  else
+    ym := ClientHeight div 2;
+  Canvas.Font.Assign(UniFont[ftSmall]);
+  PaintBattleOutcome(Canvas, ClientWidth div 2, ym, uix, ToLoc, Forecast);
+
+  for cix := 0 to ControlCount - 1 do
+    if (Controls[cix].Visible) and (Controls[cix] is TButtonBase) then
+      BtnFrame(Canvas, Controls[cix].BoundsRect, MainTexture);
 end;
 
@@ -258 +281 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-if not IsSuicideQuery then
-  Close;
+  if not IsSuicideQuery then
+    Close;
 end;
 
 procedure TBattleDlg.FormDeactivate(Sender: TObject);
 begin
-if not IsSuicideQuery then
-  Close
+  if not IsSuicideQuery then
+    Close
 end;
 
@@ -271 +294 @@
   Shift: TShiftState);
 begin
-if not IsSuicideQuery and (Key<>VK_SHIFT) then
-  begin
-  Close;
-  MainScreen.Update;
-  if Key<>VK_ESCAPE then
-    MainScreen.FormKeyDown(Sender, Key, Shift);
+  if not IsSuicideQuery and (Key <> VK_SHIFT) then
+  begin
+    Close;
+    MainScreen.Update;
+    if Key <> VK_ESCAPE then
+      MainScreen.FormKeyDown(Sender, Key, Shift);
   end
 end;
@@ -282 +305 @@
 procedure TBattleDlg.OKBtnClick(Sender: TObject);
 begin
-ModalResult:=mrOK;
+  ModalResult := mrOK;
 end;
 
 procedure TBattleDlg.CancelBtnClick(Sender: TObject);
 begin
-ModalResult:=mrCancel;
+  ModalResult := mrCancel;
 end;
 
 end.
-