Changeset 469

Timestamp:

Dec 3, 2023, 8:33:43 PM (5 months ago)

Author:

chronos

Message:

• Fixed: City screen size sometimes not correctly loaded.
• Modified: Code cleanup.

Location:

trunk

Files:

• Integrated.lpi (modified) (1 diff)
• LocalPlayer/CityScreen.lfm (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (5 diffs)
• LocalPlayer/IsoEngine.pas (modified) (17 diffs)
• Packages/DpiControls (modified) (1 prop)
• Start.pas (modified) (3 diffs)

trunk/Integrated.lpi

@@ -402 +402 @@
       <Debugging>
         <DebugInfoType Value="dsDwarf2Set"/>
+        <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>

trunk/LocalPlayer/CityScreen.lfm

@@ -1 +1 @@
 object CityDlg: TCityDlg
   Left = 1186
+  Height = 480
   Top = 183
+  Width = 640
   BorderIcons = []
   BorderStyle = bsNone

trunk/LocalPlayer/CityScreen.pas

@@ -8 +8 @@
   Protocol, ClientTools, ScreenTools, IsoEngine, BaseWin, LCLIntf, LCLType,
   Messages, SysUtils, Classes, ButtonA, ButtonC, Area, GraphType, Texture,
-  System.UITypes,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls{$ELSE}
   Graphics, Controls, Forms, ExtCtrls{$ENDIF};
@@ -195 +194 @@
 procedure TCityDlg.FormCreate(Sender: TObject);
 begin
-  inherited;
   RedTex := TTexture.Create;
   BarTex := TTexture.Create;
@@ -277 +275 @@
 
     UnshareBitmap(Back);
-    BitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+    BitBltCanvas(Back.Canvas, 0, 0, Width, Height,
       MainTexture.Image.Canvas, 0, 0);
-    ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
+    ImageOp_B(Back, Template, 0, 0, 0, 0, Width, Height);
   end;
 end;
@@ -364 +362 @@
       end;
     end;
-    Brush.style := TBrushStyle.bsClear;
+    Brush.Style := TBrushStyle.bsClear;
   end;
 end;
@@ -539 +537 @@
     Brush.Color := $FFFFFF;
     FillRect(Rect(8, 7, 36, 32));
-    Brush.style := TBrushStyle.bsClear;
+    Brush.Style := TBrushStyle.bsClear;
     Font.Color := $000000;
     S := IntToStr(C.Size);

trunk/LocalPlayer/IsoEngine.pas

@@ -97 +97 @@
       Status: Integer);
     procedure PaintCity(X, Y: Integer; const CityInfo: TCityInfo;
-      accessory: Boolean = True);
+      Accessory: Boolean = True);
     procedure BitBltBitmap(Src: TBitmap; X, Y, Width, Height, xSrc, ySrc,
       Rop: Integer);
@@ -715 +715 @@
       if Flags and unFortified <> 0 then
       begin
-        { DataCanvas:=HGrTerrain.Data.Canvas;
-          MaskCanvas:=HGrTerrain.Mask.Canvas;
-          TSprite(X,Y+16,12*9+7); }
+        { DataCanvas := HGrTerrain.Data.Canvas;
+          MaskCanvas := HGrTerrain.Mask.Canvas;
+          TSprite(X, Y + 16, 12 * 9 + 7);  }
         Sprite(HGrStdUnits, X, Y, xxu * 2, yyu * 2, 1 + 6 * (xxu * 2 + 1), 1);
       end;
@@ -724 +724 @@
 
 procedure TIsoMap.PaintCity(X, Y: Integer; const CityInfo: TCityInfo;
-  accessory: Boolean);
-var
-  age: Integer;
+  Accessory: Boolean);
+var
+  Age: Integer;
   cHGr: TGraphicSet;
   cpix: Integer;
@@ -737 +737 @@
   S: string;
 begin
-  age := GetAge(CityInfo.Owner);
+  Age := GetAge(CityInfo.Owner);
   if CityInfo.size < 5 then
     xGr := 0
@@ -746 +746 @@
   else
     xGr := 3;
-  Tribe[CityInfo.Owner].InitAge(age);
-  if age < 2 then
+  Tribe[CityInfo.Owner].InitAge(Age);
+  if Age < 2 then
   begin
     cHGr := Tribe[CityInfo.Owner].cHGr;
@@ -764 +764 @@
     if ciWalled and CityInfo.Flags <> 0 then
       Sprite(HGrCities, X - xxt, Y - 2 * yyt, 2 * xxt, 3 * yyt,
-        (xGr + 4) * (2 * xxt + 1) + 1, 1 + (age - 2) * (3 * yyt + 1))
+        (xGr + 4) * (2 * xxt + 1) + 1, 1 + (Age - 2) * (3 * yyt + 1))
     else
       Sprite(HGrCities, X - xxt, Y - 2 * yyt, 2 * xxt, 3 * yyt,
-        xGr * (2 * xxt + 1) + 1, 1 + (age - 2) * (3 * yyt + 1));
-  end;
-
-  if not accessory then
+        xGr * (2 * xxt + 1) + 1, 1 + (Age - 2) * (3 * yyt + 1));
+  end;
+
+  if not Accessory then
     Exit;
 
-  { if ciCapital and CityInfo.Flags<>0 then
-    Sprite(Tribe[CityInfo.Owner].symHGr,X+cpic.xf,Y-13+cpic.yf,13,14,
-    1+Tribe[CityInfo.Owner].sympix mod 10 *65,
-    1+Tribe[CityInfo.Owner].sympix div 10 *49); {capital -- paint flag }
+  { if ciCapital and CityInfo.Flags <> 0 then
+    Sprite(Tribe[CityInfo.Owner].symHGr, X + cpic.xf, Y - 13 + cpic.yf, 13, 14,
+    1 + Tribe[CityInfo.Owner].sympix mod 10 * 65,
+    1 + Tribe[CityInfo.Owner].sympix div 10 * 49); (*capital -- paint flag *)
+  }
 
   if MyMap[CityInfo.Loc] and fObserved <> 0 then
   begin
-    if age < 2 then
+    if Age < 2 then
     begin
       cpic := Tribe[CityInfo.Owner].CityPicture[xGr];
@@ -788 +789 @@
     else
     begin
-      cpic := CitiesPictures.Pictures[age, xGr];
+      cpic := CitiesPictures.Pictures[Age, xGr];
       xShield := X - xxt + cpic.xShield;
       yShield := Y - 2 * yyt + cpic.yShield;
@@ -1240 +1241 @@
   else if ShowObjects then
   begin
-    { if (CityLoc<0) and (UnFocus>=0) and (Loc=MyUn[UnFocus].Loc) then
-      if BlinkOn then TSprite(X,Y,8+9*0)
-      else TSprite(X,Y,8+9*1); }
+    { if (CityLoc < 0) and (UnFocus >= 0) and (Loc = MyUn[UnFocus].Loc) then
+      if BlinkOn then TSprite(X, Y, 8 + 9 * 0)
+      else TSprite(X, Y, 8 + 9 * 1); }
 
     NameCity;
@@ -1279 +1280 @@
             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);
@@ -1306 +1307 @@
 procedure TIsoMap.PaintGrid(X, Y, nx, ny: Integer);
 
-  procedure ClippedLine(dx0, dy0: Integer; mirror: Boolean);
+  procedure ClippedLine(dx0, dy0: Integer; Mirror: Boolean);
   var
     x0, x1, dxmin, dymin, dxmax, dymax, N: Integer;
@@ -1317 +1318 @@
       dymax := (RealBottom - Y - 1) div yyt + 1;
       N := dymax - dy0;
-      if mirror then
+      if Mirror then
       begin
         if dx0 - dxmin < N then
@@ -1325 +1326 @@
           N := N - (dx0 - dxmax);
           dy0 := dy0 + (dx0 - dxmax);
-          dx0 := dxmax
+          dx0 := dxmax;
         end;
         if dy0 < dymin then
@@ -1331 +1332 @@
           N := N - (dymin - dy0);
           dx0 := dx0 - (dymin - dy0);
-          dy0 := dymin
+          dy0 := dymin;
         end;
       end
@@ -1342 +1343 @@
           N := N - (dxmin - dx0);
           dy0 := dy0 + (dxmin - dx0);
-          dx0 := dxmin
+          dx0 := dxmin;
         end;
         if dy0 < dymin then
@@ -1348 +1349 @@
           N := N - (dymin - dy0);
           dx0 := dx0 + (dymin - dy0);
-          dy0 := dymin
+          dy0 := dymin;
         end;
       end;
       if N <= 0 then
         Exit;
-      if mirror then
+      if Mirror then
       begin
         x0 := X + dx0 * xxt - 1;
@@ -1363 +1364 @@
         x1 := X + (dx0 + N) * xxt;
       end;
-      moveto(x0, Y + dy0 * yyt);
-      lineto(x1, Y + (dy0 + N) * yyt);
+      MoveTo(x0, Y + dy0 * yyt);
+      LineTo(x1, Y + (dy0 + N) * yyt);
     end;
   end;
@@ -1454 +1455 @@
   begin
     if CityAllowClick then
-      pen.Color := $FFFFFF
+      Pen.Color := $FFFFFF
     else
-      pen.Color := $000000;
-    pen.Width := 1;
+      Pen.Color := $000000;
+    Pen.Width := 1;
     for I := 0 to 3 do
     begin
-      moveto(xm - xxt * (4 - I), ym + yyt * (1 + I));
-      lineto(xm + xxt * (1 + I), ym - yyt * (4 - I));
-      moveto(xm - xxt * (4 - I), ym - yyt * (1 + I));
-      lineto(xm + xxt * (1 + I), ym + yyt * (4 - I));
+      MoveTo(xm - xxt * (4 - I), ym + yyt * (1 + I));
+      LineTo(xm + xxt * (1 + I), ym - yyt * (4 - I));
+      MoveTo(xm - xxt * (4 - I), ym - yyt * (1 + I));
+      LineTo(xm + xxt * (1 + I), ym + yyt * (4 - I));
     end;
-    moveto(xm - xxt * 4, ym + yyt * 1);
-    lineto(xm - xxt * 1, ym + yyt * 4);
-    moveto(xm + xxt * 1, ym + yyt * 4);
-    lineto(xm + xxt * 4, ym + yyt * 1);
-    moveto(xm - xxt * 4, ym - yyt * 1);
-    lineto(xm - xxt * 1, ym - yyt * 4);
-    moveto(xm + xxt * 1, ym - yyt * 4);
-    lineto(xm + xxt * 4, ym - yyt * 1);
-    pen.Width := 1;
+    MoveTo(xm - xxt * 4, ym + yyt * 1);
+    LineTo(xm - xxt * 1, ym + yyt * 4);
+    MoveTo(xm + xxt * 1, ym + yyt * 4);
+    LineTo(xm + xxt * 4, ym + yyt * 1);
+    MoveTo(xm - xxt * 4, ym - yyt * 1);
+    LineTo(xm - xxt * 1, ym - yyt * 4);
+    MoveTo(xm + xxt * 1, ym - yyt * 4);
+    LineTo(xm + xxt * 4, ym - yyt * 1);
+    Pen.Width := 1;
   end;
 end;

trunk/Start.pas

@@ -6 +6 @@
 uses
   GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
-  LCLIntf, LCLType, SysUtils, Classes, System.UITypes,
+  LCLIntf, LCLType, SysUtils, Classes,
   Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain, Translator,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Menus{$ELSE}
@@ -229 +229 @@
   end;
   LoadConfig;
-  LoadAssets;
+  //LoadAssets;
   LoadLanguages;
 
@@ -682 +682 @@
             begin
               Canvas.Font.Assign(UniFont[ftCaption]);
-              // Canvas.Font.Style:=Canvas.Font.Style+[fsUnderline];
+              // Canvas.Font.Style := Canvas.Font.Style + [fsUnderline];
               RisedTextOut(Canvas, xActionIcon + 99, Y,
                 Format(Phrases2.Lookup('ACTIONHEADER_WEB'), [CevoHomepageShort]));