Changeset 447 for trunk/LocalPlayer/Battle.pas

Timestamp:

May 19, 2022, 10:39:34 PM (2 years ago)

Author:

chronos

Message:

• Modified: Use first capital letter in identifiers.

File:

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

trunk/LocalPlayer/Battle.pas

@@ -32 +32 @@
     uix, ToLoc: Integer;
     Forecast: TBattleForecastEx;
-    IsSuicideQuery: boolean;
+    IsSuicideQuery: Boolean;
   end;
 
@@ -63 +63 @@
   TextSize: TSize;
   LabelText: string;
-  FirstStrike: boolean;
+  FirstStrike: Boolean;
 begin
   MaxBar := 65;
@@ -196 +196 @@
   BitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm - 8 - 4 - 66,
     ym + 8 + 12);
-  MakeUnitInfo(me, MyUn[uix], UnitInfo);
+  MakeUnitInfo(Me, MyUn[uix], UnitInfo);
   UnitInfo.Flags := UnitInfo.Flags and not unFortified;
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
@@ -216 +216 @@
     ClientWidth := 300;
     ClientHeight := 288;
-    OKBtn.Visible := true;
-    CancelBtn.Visible := true;
+    OKBtn.Visible := True;
+    CancelBtn.Visible := True;
     Left := (Screen.Width - ClientWidth) div 2; // center on screen
     Top := (Screen.Height - ClientHeight) div 2;
@@ -225 +225 @@
     ClientWidth := 178;
     ClientHeight := 178;
-    OKBtn.Visible := false;
-    CancelBtn.Visible := false;
+    OKBtn.Visible := False;
+    CancelBtn.Visible := False;
   end;
 end;
@@ -232 +232 @@
 procedure TBattleDlg.FormPaint(Sender: TObject);
 var
-  ym, cix, p: Integer;
-  s, s1: string;
+  ym, cix, P: Integer;
+  S, s1: string;
 begin
   with Canvas do
@@ -253 +253 @@
   begin
     Canvas.Font.Assign(UniFont[ftCaption]);
-    s := Phrases.Lookup('TITLE_SUICIDE');
-    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
-      7 + Border, s);
+    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)
+    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);
+      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);
+      s1 := Copy(S, P + 1, 255);
       RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
         205 + (MessageLineSpacing - MessageLineSpacing div 2), s1);