Changeset 209

Timestamp:

May 9, 2020, 11:59:40 AM (5 years ago)

Author:

chronos

Message:

• Modified: Code formatting.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (15 diffs)
• LocalPlayer/Draft.pas (modified) (2 diffs)
• LocalPlayer/UnitStat.pas (modified) (2 diffs)
• Packages/CevoComponents/ButtonA.pas (modified) (1 diff)
• Start.pas (modified) (3 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -260 +260 @@
     Back.Canvas.FillRect(0, 0, ClientWidth, ClientHeight);
 
-    bitbltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+    BitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, 0, 0);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
@@ -291 +291 @@
   Color2 := Colors.Canvas.Pixels[clkAge0 + Age, cliHouse];
   SmallCityMap.Canvas.FillRect(0, 0, SmallCityMap.Width, SmallCityMap.Height);
-  bitbltCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
+  BitBltCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
     SmallCityMapTemplate.Canvas, 83 * SizeClass, 0);
   if IsPort then
   begin
-    bitbltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+    BitBltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
       SmallCityMapTemplate.Canvas, 332 + 15, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, 83, hSmallMap, Color0, Color1, Color2);
@@ -303 +303 @@
   else
   begin
-    bitbltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+    BitBltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
       SmallCityMapTemplate.Canvas, 332, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, wSmallMap, hSmallMap, Color0,
@@ -311 +311 @@
   with SmallCityMap.Canvas do
   begin
-    brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
+    Brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
     for i := 0 to 29 do
     begin
@@ -359 +359 @@
   ZoomCityMap.Canvas.FillRect(0, 0, ZoomCityMap.Width, ZoomCityMap.Height);
 
-  bitbltCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
+  BitBltCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
     Back.Canvas, xZoomMap, yZoomMap);
   if Mode = mImp then begin
@@ -542 +542 @@
   RedTex.clTextShade := $0000FF;
 
-  bitbltCanvas(offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
-
-  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  BitBltCanvas(offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
+
+  Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
   RisedTextOut(offscreen.Canvas, 42, 7, Caption);
   with offscreen.Canvas do
@@ -557 +557 @@
     TextOut(8 + 14 - textwidth(s) div 2, 7, s);
   end;
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
 
   if not IsCityAlive then
@@ -613 +613 @@
     false, AllowChange and IsCityAlive and
     (c.Status and csResourceWeightsMask = 0));
-  bitbltCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
+  BitBltCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
     xmArea + 102, 42);
 
@@ -644 +644 @@
     else
       xGr := 141;
-    bitbltCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
+    BitBltCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
       27, 30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
@@ -656 +656 @@
   begin
     xGr := 1 + 112;
-    bitbltCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
+    BitBltCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
       30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
@@ -802 +802 @@
 
   // small map
-  bitbltCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
+  BitBltCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
     SmallCityMap.Canvas, 0, 0);
   if Mode = mImp then
@@ -830 +830 @@
   Sprite(offscreen, HGrSystem, x + 6, y - 5, 10, 10, 154, 126);
 
-  bitbltCanvas(offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
+  BitBltCanvas(offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
     ZoomCityMap.Canvas, 0, 0);
 
@@ -1619 +1619 @@
       with Canvas do
       begin
-        bitbltCanvas(Canvas, xView + 5, yView + 1, 64, 2, Back.Canvas,
+        BitBltCanvas(Canvas, xView + 5, yView + 1, 64, 2, Back.Canvas,
           xView + 5, yView + 1);
-        bitbltCanvas(Canvas, xView + 5, yView + 3, 2, 42, Back.Canvas,
+        BitBltCanvas(Canvas, xView + 5, yView + 3, 2, 42, Back.Canvas,
           xView + 5, yView + 3);
-        bitbltCanvas(Canvas, xView + 5 + 62, yView + 3, 2, 42,
+        BitBltCanvas(Canvas, xView + 5 + 62, yView + 3, 2, 42,
           Back.Canvas, xView + 5 + 62, yView + 3);
         ScreenTools.Frame(Canvas, xView + 9 - 1, yView + 5 - 1, xView + 9 + xSizeBig,
@@ -1629 +1629 @@
         RFrame(Canvas, xView + 9 - 2, yView + 5 - 2, xView + 9 + xSizeBig + 1,
           yView + 5 + ySizeBig + 1, $FFFFFF, $B0B0B0);
-        brush.Color := $000000;
+        Brush.Color := $000000;
         FillRect(Rect(xView + 9, yView + 5, xView + 1 + 72 - 8,
           yView + 5 + 40));
-        brush.style := bsClear;
+        Brush.style := bsClear;
       end
     else if BlinkTime = 6 then
@@ -1643 +1643 @@
       else if c.Project and cpImp = 0 then
       begin // project is unit
-        bitbltCanvas(Canvas, xView + 9, yView + 5, xSizeBig, ySizeBig,
-          bigimp.Canvas, 0, 0);
+        BitBltCanvas(Canvas, xView + 9, yView + 5, xSizeBig, ySizeBig,
+          Bigimp.Canvas, 0, 0);
         with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
           Sprite(Canvas, HGr, xView + 5, yView + 1, 64, 44, pix mod 10 * 65 + 1,

trunk/LocalPlayer/Draft.pas

@@ -239 +239 @@
   // assemble background from 2 texture tiles
   begin
-    bitbltCanvas(Back.Canvas, 0, 0, ClientWidth, 64,
+    BitBltCanvas(Back.Canvas, 0, 0, ClientWidth, 64,
       MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
       hMainTexture - 64);
-    bitbltCanvas(Back.Canvas, 0, 64, ClientWidth, ClientHeight - 64,
+    BitBltCanvas(Back.Canvas, 0, 64, ClientWidth, ClientHeight - 64,
       MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
       0);
   end
   else
-    bitbltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+    BitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
       (hMainTexture - ClientHeight) div 2);
@@ -254 +254 @@
     Template.Height - 64 - Cut);
 
-  bitbltCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+  BitBltCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
     Back.Canvas, 0, 0);
 

trunk/LocalPlayer/UnitStat.pas

@@ -445 +445 @@
           yImp + ySizeSmall, MainTexture.clBevelLight,
           MainTexture.clBevelShade);
-        bitbltCanvas(offscreen.Canvas, x, yImp, xSizeSmall, ySizeSmall,
+        BitBltCanvas(offscreen.Canvas, x, yImp, xSizeSmall, ySizeSmall,
           SmallImp.Canvas, j mod 7 * xSizeSmall,
           (j + SystemIconLines * 7) div 7 * ySizeSmall);
@@ -564 +564 @@
                     * (yyt * 3 + 1));
               end;
-          bitbltCanvas(offscreen.Canvas, xView, yView + 16, 64, 32,
+          BitBltCanvas(offscreen.Canvas, xView, yView + 16, 64, 32,
             Buffer.Canvas, 1, 0);
 

trunk/Packages/CevoComponents/ButtonA.pas

@@ -55 +55 @@
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 100, 25))
-    end
+    end;
 end;
 

trunk/Start.pas

@@ -880 +880 @@
             end;
         end;
-      inc(y, ActionPitch);
+      Inc(y, ActionPitch);
     end;
   end
@@ -1138 +1138 @@
 procedure TStartDlg.StartBtnClick(Sender: TObject);
 var
-  I, GameCount, MapCount: integer;
+  I, GameCount, MapCount: Integer;
   FileName: string;
   Reg: TRegistry;
@@ -1473 +1473 @@
   s: string;
   Reg: TRegistry;
-  invalidateTab0: boolean;
-begin
-  invalidateTab0 := (Page = pgMain) or (NewPage = pgMain);
+  InvalidateTab0: boolean;
+begin
+  InvalidateTab0 := (Page = pgMain) or (NewPage = pgMain);
   Page := NewPage;
   case Page of