Changeset 536 for trunk

Timestamp:

Apr 15, 2024, 8:59:23 PM (8 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (4 diffs)
• LocalPlayer/CityType.pas (modified) (1 diff)
• LocalPlayer/Diagram.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (6 diffs)
• LocalPlayer/NatStat.pas (modified) (2 diffs)
• LocalPlayer/Select.pas (modified) (3 diffs)
• LocalPlayer/UnitStat.pas (modified) (8 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -579 +579 @@
       J := Pos('\', S);
       if J = 0 then
-        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40,
+        LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xmOpt + 40,
           ymOpt - 9, S)
       else
       begin
-        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40,
+        LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xmOpt + 40,
           ymOpt - 17, Copy(S, 1, J - 1));
-        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40, ymOpt - 1,
+        LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xmOpt + 40, ymOpt - 1,
           Copy(S, J + 1, 255));
       end;
@@ -718 +718 @@
     CutCityFoodSurplus(Report.FoodSurplus, IsCityAlive, cGov, C.Size),
     Report.Storage, 1, CanGrow);
-  LoweredTextout(Offscreen.Canvas, -1, MainTexture, xFood + 3 - 5,
+  LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xFood + 3 - 5,
     yFood + 102 - 20, Format('%d/%d', [TrueFood, Report.Storage]));
-  LoweredTextout(Offscreen.Canvas, -1, MainTexture, xFood - 2, yFood + 66,
+  LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xFood - 2, yFood + 66,
     Phrases.Lookup('STORAGE'));
 
@@ -751 +751 @@
         I := 0;
       FillBar(xProd + 3, yProd + 16 + 63, TrueProd, I, PrCost, 4, True);
-      LoweredTextout(Offscreen.Canvas, -1, MainTexture, xProd + 3 - 5,
+      LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xProd + 3 - 5,
         yProd + 16 + 43, Format('%d/%d', [TrueProd, PrCost]));
       if BiColorTextWidth(Offscreen.Canvas, PrName) > wBar + dxBar then
@@ -912 +912 @@
   else { if SmallMapMode = smSupportedUnits then }
   begin
-    LoweredTextout(Offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
+    LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
       yZoomMap + 2, Phrases.Lookup('SUPUNITS'));
     FreeSupp := C.Size * SupportFree[cGov] shr 1;

trunk/LocalPlayer/CityType.pas

@@ -134 +134 @@
       S := IntToStr(I + 1);
       Font.Color := MainTexture.ColorTextLight;
-      Textout(xList + 20 + I mod nListCol * 42 - TextWidth(S) div 2,
+      TextOut(xList + 20 + I mod nListCol * 42 - TextWidth(S) div 2,
         yList + 15 + I div nListCol * 32 - TextHeight(S) div 2, S);
     end;

trunk/LocalPlayer/Diagram.pas

@@ -220 +220 @@
         LineTo(X, InnerHeight - Border);
         S := IntToStr(Abs(TurnToYear(T * LineStep)));
-        Textout(X - TextWidth(S) div 2, Border - 16, S);
+        TextOut(X - TextWidth(S) div 2, Border - 16, S);
       end;
 

trunk/LocalPlayer/Draft.pas

@@ -171 +171 @@
                   xTotal2 + W - 1 - dx, Y + 16));
                 Brush.Style := TBrushStyle.bsClear;
-                Textout(xTotal2 - 3 - dx + 1, Y, S);
+                TextOut(xTotal2 - 3 - dx + 1, Y, S);
               end;
             end;

trunk/LocalPlayer/IsoEngine.pas

@@ -76 +76 @@
     procedure PaintGrid(X, Y, nx, ny: Integer);
     procedure FillRect(X, Y, Width, Height, Color: Integer);
-    procedure Textout(X, Y, Color: Integer; const S: string);
+    procedure TextOut(X, Y, Color: Integer; const S: string);
     procedure Sprite(HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
     procedure TSprite(xDst, yDst, grix: Integer; PureBlack: Boolean = False);
@@ -581 +581 @@
 end;
 
-procedure TIsoMap.Textout(X, Y, Color: Integer; const S: string);
+procedure TIsoMap.TextOut(X, Y, Color: Integer; const S: string);
 begin
   FOutput.Canvas.Font.Color := Color;
@@ -797 +797 @@
       LabelTextColor := $000000;
     end;
-    Textout(xShield + 2, yShield - 1, LabelTextColor, S);
+    TextOut(xShield + 2, yShield - 1, LabelTextColor, S);
   end;
 end;
@@ -1076 +1076 @@
       if IsCapital then
         FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style + [TFontStyle.fsUnderline];
-      Textout(xs + 1, Y - 9, $000000, S);
-      Textout(xs, Y - 10, $FFFFFF, S);
+      TextOut(xs + 1, Y - 9, $000000, S);
+      TextOut(xs, Y - 10, $FFFFFF, S);
       if IsCapital then
         FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style - [TFontStyle.fsUnderline];
@@ -1272 +1272 @@
             PaintUnit(X + (xxt - xxu), Y + (yyt - yyu_anchor), UnitInfo,
               MyUn[uix].Status);
-          // if Showuix then Textout(x + 16, y + 5, $80FF00, IntToStr(uix));
+          // if Showuix then TextOut(x + 16, y + 5, $80FF00, IntToStr(uix));
         end
         else {$ENDIF} PaintUnit(X + (xxt - xxu), Y + (yyt - yyu_anchor), UnitInfo, 0);
@@ -1290 +1290 @@
   if (Loc >= 0) and (Loc < G.lx * G.ly) then
     if ShowLoc then
-      Textout(X + xxt - 16, Y + yyt - 9, $FFFF00, IntToStr(Loc))
+      TextOut(X + xxt - 16, Y + yyt - 9, $FFFF00, IntToStr(Loc))
     else if ShowDebug and (DebugMap <> nil) and (Loc >= 0) and
       (Loc < G.lx * G.ly) and (DebugMap[Loc] <> 0) then
-      Textout(X + xxt - 16, Y + yyt - 9, $00E0FF,
+      TextOut(X + xxt - 16, Y + yyt - 9, $00E0FF,
         IntToStr(Integer(DebugMap[Loc])))
 end;

trunk/LocalPlayer/NatStat.pas

@@ -266 +266 @@
 
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  RisedTextout(Offscreen.Canvas,
-    40 { (ClientWidth-BiColorTextWidth(offscreen.canvas,caption)) div 2 } ,
+  RisedTextOut(Offscreen.Canvas,
+    40 { (ClientWidth - BiColorTextWidth(Offscreen.Canvas,Caption)) div 2 },
     7, Caption);
 
@@ -383 +383 @@
     begin
       S := Phrases.Lookup('FRNOCIVILREP');
-      RisedTextout(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
         yReport + hReport div 2 - 10, S);
     end;

trunk/LocalPlayer/Select.pas

@@ -242 +242 @@
   CityReport: TCityReportNew;
   mox: ^TModelInfo;
-  S, number: string;
+  S, Number: string;
   CanGrow: Boolean;
 begin
@@ -363 +363 @@
               y0 + 2, 131, 3);
             ca.Font.Assign(UniFont[ftSmall]);
-            RisedTextout(Offscreen.Canvas, 103 + CityNameSpace + 4 + 31,
+            RisedTextOut(Offscreen.Canvas, 103 + CityNameSpace + 4 + 31,
               y0 + 1, S);
             ca.Font.Assign(UniFont[ftNormal]);
@@ -652 +652 @@
               else if (Kind = kScience) and (FutureCount > 0) then
               begin
-                number := IntToStr(FutureCount);
-                RisedTextout(ca, 104 - 33 + 15 + 10 + TechNameSpace + 24 * J -
-                  BiColorTextWidth(ca, number) div 2, y0, number);
+                Number := IntToStr(FutureCount);
+                RisedTextOut(ca, 104 - 33 + 15 + 10 + TechNameSpace + 24 * J -
+                  BiColorTextWidth(ca, Number) div 2, y0, Number);
               end;
             end;

trunk/LocalPlayer/UnitStat.pas

@@ -305 +305 @@
         S := Phrases.Lookup('UNITSPECIAL');
         Font.Color := $000000;
-        Textout(X - 1, Y + 1, S);
+        TextOut(X - 1, Y + 1, S);
         Font.Color := $B0B0B0;
-        Textout(X - 2, Y, S);
+        TextOut(X - 2, Y, S);
       end
       else
@@ -346 +346 @@
               FillRect(Rect(X - 3 + dx, Y + 2, X + W - 1 + dx, Y + 16));
               Brush.Style := TBrushStyle.bsClear;
-              Textout(X - 3 + dx + 1, Y, S);
+              TextOut(X - 3 + dx + 1, Y, S);
               Inc(dx, W + 1);
             end;
@@ -364 +364 @@
     DLine(Dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade, T.ColorBevelLight);
     LoweredTextOut(Dst.Canvas, -1, T, X - 2, Y, Cap);
-    RisedTextout(Dst.Canvas, X + 170 - BiColorTextWidth(Dst.Canvas, S), Y, S);
+    RisedTextOut(Dst.Canvas, X + 170 - BiColorTextWidth(Dst.Canvas, S), Y, S);
   end;
 
@@ -559 +559 @@
             LightGradient(Offscreen.Canvas, xView - 45, yView + 24, 38,
               (ColorOfHealth(Health) and $FEFEFE shr 2) * 3);
-            RisedTextout(Offscreen.Canvas, xView - 45 + 20 -
+            RisedTextOut(Offscreen.Canvas, xView - 45 + 20 -
               BiColorTextWidth(Offscreen.Canvas, S) div 2, yView + 23, S);
           end;
@@ -579 +579 @@
 
       DarkGradient(Offscreen.Canvas, xTotal - 6, yTotal + 1, 180, 2);
-      RisedTextout(Offscreen.Canvas, xTotal - 2, yTotal,
+      RisedTextOut(Offscreen.Canvas, xTotal - 2, yTotal,
         Phrases.Lookup('UNITSTRENGTH'));
       S := IntToStr(mi.Attack) + '/' + IntToStr(mi.Defense);
-      RisedTextout(Offscreen.Canvas,
+      RisedTextOut(Offscreen.Canvas,
         xTotal + 170 - BiColorTextWidth(Offscreen.Canvas, S), yTotal, S);
       FeatureBar(Offscreen, xTotal, yTotal + 19, mi, MainTexture);
@@ -595 +595 @@
       else
         S := IntToStr(mi.cost * BuildCostMod[G.Difficulty[Me]] div 12);
-      RisedTextout(Offscreen.Canvas,
+      RisedTextOut(Offscreen.Canvas,
         xTotal + 159 - BiColorTextWidth(Offscreen.Canvas, S), yTotal + 57, S);
       Sprite(Offscreen, HGrSystem, xTotal + 160, yTotal + 57 + 5, 10,
@@ -614 +614 @@
             MainTexture.ColorTextLight);
           S := TurnToString(MyModel[mixShow].IntroTurn);
-          RisedTextout(Offscreen.Canvas,
+          RisedTextOut(Offscreen.Canvas,
             xTotal + 170 - BiColorTextWidth(Offscreen.Canvas, S),
             (yTotal + StatDown - 19), S);
@@ -673 +673 @@
       yCaption := 79;
   end;
-  RisedTextout(Offscreen.Canvas,
+  RisedTextOut(Offscreen.Canvas,
     (ClientWidth - BiColorTextWidth(Offscreen.Canvas, Caption)) div 2,
     yCaption, Caption);

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -1233 +1233 @@
   P, xp: Integer;
   sp: string;
-  shadow: Boolean;
+  Shadow: Boolean;
   Text: string;
 begin
   Inc(X);
   Inc(Y);
-  for shadow := True downto False do
+  for Shadow := True downto False do
     with Canvas do
-      if not shadow or (clBack <> $7F007F) then
+      if not Shadow or (clBack <> $7F007F) then
       begin
-        if shadow then
+        if Shadow then
           Font.Color := clBack
         else
@@ -1253 +1253 @@
             (sp[P + 1] in ['c', 'f', 'l', 'm', 'n', 'o', 'p', 'r', 't', 'w']) then
           begin
-            Canvas.Textout(xp, Y, sp);
+            Canvas.TextOut(xp, Y, sp);
             Break;
           end
@@ -1259 +1259 @@
           begin
             Text := Copy(sp, 1, P - 1);
-            Textout(xp, Y, Text);
+            TextOut(xp, Y, Text);
             Inc(xp, Canvas.TextWidth(Text));
-            if not shadow then
+            if not Shadow then
               case sp[P + 1] of
                 'c': PaintIcon(xp + 1, Y, 6);