Changeset 60 for trunk

Timestamp:

Jan 13, 2017, 6:51:27 PM (7 years ago)

Author:

chronos

Message:

• Fixed: City mini map was drawn incorrectly.

Location:

trunk

Files:

• LocalPlayer/BaseWin.pas (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (3 diffs)
• Protocol.pas (modified) (7 diffs)
• ScreenTools.pas (modified) (3 diffs)

trunk/LocalPlayer/BaseWin.pas

@@ -191 +191 @@
     SmartInvalidate;
     if ImmUpdate then
-      Update
-  end
+      Update;
+  end;
 end;
 

trunk/LocalPlayer/CityScreen.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
-
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonA,
-  ButtonB, ButtonBase, ButtonC, Area;
+  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
+  ButtonA, ButtonC, Area;
 
 const
@@ -237 +235 @@
 procedure TCityDlg.FormDestroy(Sender: TObject);
 begin
-  AreaMap.Free;
-  SmallCityMap.Free;
-  ZoomCityMap.Free;
-  SmallCityMapTemplate.Free;
-  CityMapTemplate.Free;
-  Template.Free;
-  Back.Free;
+  FreeAndNil(AreaMap);
+  FreeAndNil(SmallCityMap);
+  FreeAndNil(ZoomCityMap);
+  FreeAndNil(SmallCityMapTemplate);
+  FreeAndNil(CityMapTemplate);
+  FreeAndNil(Template);
+  FreeAndNil(Back);
 end;
 
@@ -352 +350 @@
 procedure TCityDlg.InitZoomCityMap;
 begin
+  // TODO: FillRect should not be needed as BitBlt is with SRCCOPY
+  ZoomCityMap.Canvas.FillRect(0, 0, ZoomCityMap.Width, ZoomCityMap.Height);
+
   bitblt(ZoomCityMap.Canvas.Handle, 0, 0, wZoomMap, hZoomMap,
     Back.Canvas.Handle, xZoomMap, yZoomMap, SRCCOPY);
-  if Mode = mImp then
-  begin
-    if ZoomArea < 3 then
+  if Mode = mImp then begin
+    if ZoomArea < 3 then begin
       ImageOp_B(ZoomCityMap, CityMapTemplate, 0, 0, 376 * SizeClass,
-        112 * ZoomArea, wZoomMap, hZoomMap)
-    else
-    begin
+        112 * ZoomArea, wZoomMap, hZoomMap);
+    end else begin
       ImageOp_B(ZoomCityMap, CityMapTemplate, 0, 0, 376 * SizeClass + 216,
         112 * (ZoomArea - 3), wZoomMap - wZoomEnvironment, hZoomMap);

trunk/Protocol.pas

@@ -1196 +1196 @@
 mcLine = 26;
 mcFirstNonCap = mcNav;
-AutoFeature:
-Set of mcFirstNonCap .. nFeature - 1 = [mcNav, mcSE, mcNP, mcJet, mcAcademy];
+AutoFeature: set of mcFirstNonCap .. nFeature - 1 = [mcNav, mcSE, mcNP, mcJet,
+  mcAcademy];
 // unit class advances, automatically applied if available
 
-Feature:
-array [0 .. nFeature - 1] of { unit model features }
+Feature: array [0 .. nFeature - 1] of { unit model features }
   record Domains, Preq, Weight, Cost: integer;
 end
@@ -1232 +1231 @@
   (Domains: 7; Preq: adMassProduction; Weight: 0; Cost: 0)); { mcLine }
 
-WeightPreq7:
-array [0 .. nDomains - 1] of integer = (adHorsebackRiding, adSeafaring,
+WeightPreq7: array [0 .. nDomains - 1] of integer = (adHorsebackRiding, adSeafaring,
   adAdvancedFlight);
-WeightPreq10:
-array [0 .. nDomains - 1] of integer = (adAutomobile, adSteel, preNA);
+WeightPreq10: array [0 .. nDomains - 1] of integer = (adAutomobile, adSteel, preNA);
 
 INFIN = 999999;
@@ -1333 +1330 @@
     Exp, { micro experience, the level is Exp div ExpCost }
     Load: Byte; { number of transported units }
-    Flags: word end;
-
-    TCityInfo = packed record Loc, Status, // free for AI use
+    Flags: word;
+  end;
+
+  TCityInfo = packed record
+    Loc, Status, // free for AI use
     SavedStatus: LongInt; // for server internal use only
     Owner, // last known owner, even if not alive anymore!
@@ -1398 +1397 @@
 
   TTileInfo = record
-    Food, Prod, Trade, ExplCity: integer end;
-    TCityReport = record HypoTiles, HypoTax, HypoLux, Working, Happy, FoodRep,
+    Food, Prod, Trade, ExplCity: integer;
+  end;
+
+  TCityReport = record
+    HypoTiles, HypoTax, HypoLux, Working, Happy, FoodRep,
       ProdRep, Trade, PollRep, Corruption, Tax, Lux, Science, Support, Eaten,
       ProdCost, Storage, Deployed: integer;
@@ -1432 +1434 @@
   TGetCityData = record
     Owner: integer;
-    c: TCity end;
-    TCityAreaInfo = record Available: array [0 .. 26] of integer;
+    c: TCity;
+  end;
+
+  TCityAreaInfo = record
+    Available: array [0 .. 26] of integer;
   end;
 
@@ -1461 +1466 @@
     Ship1Change, Ship2Change: array [0 .. nShipPart - 1] of integer;
   end;
-  TOffer = record nDeliver, nCost: integer;
+  TOffer = record
+    nDeliver, nCost: integer;
     Price: array [0 .. 11] of Cardinal;
   end;
@@ -1627 +1633 @@
 
 procedure MakeUnitInfo(p: integer; const u: TUn; var ui: TUnitInfo);
-  procedure MakeModelInfo(p, mix: integer; const m: TModel; var mi: TModelInfo);
-    function IsSameModel(const mi1, mi2: TModelInfo): boolean;
-      function SpecialTile(Loc, TerrType, lx: integer): integer;
+procedure MakeModelInfo(p, mix: integer; const m: TModel; var mi: TModelInfo);
+function IsSameModel(const mi1, mi2: TModelInfo): boolean;
+function SpecialTile(Loc, TerrType, lx: integer): integer;
 
 implementation

trunk/ScreenTools.pas

@@ -653 +653 @@
 // X channel = background amp (old Dst content), 128=original brightness
 var
-  i, Brightness, test: integer;
+  X, Y: Integer;
+  Brightness, test: integer;
   PixelSrc: ^Byte;
   PixelDst: PPixel32;
 begin
-  {TODO assert(Src.PixelFormat = pf8bit);}
-  assert(dst.PixelFormat = pf24bit);
+  //TODO Assert(Src.PixelFormat = pf8bit);
+  Assert(dst.PixelFormat = pf24bit);
   if xDst < 0 then
   begin
@@ -680 +681 @@
   dst.BeginUpdate;
   Src.BeginUpdate;
-  h := yDst + h;
-  while yDst < h do
-  begin
-    PixelDst := GetBitmapPixelPtr(dst, xDst, yDst);
-    PixelSrc := Src.ScanLine[ySrc] + xSrc;
-    for i := 0 to w - 1 do
-    begin
+  for Y := 0 to h - 1 do begin
+    PixelDst := GetBitmapPixelPtr(dst, xDst, yDst + Y);
+    PixelSrc := Pointer(GetBitmapPixelPtr(Src, xSrc, ySrc + Y));
+    for X := 0 to w - 1 do begin
       Brightness := PixelSrc^;
       test := (PixelDst^.R * Brightness) shr 7;
@@ -700 +698 @@
         PixelDst^.B := test; // Blue
       PixelDst := Pointer(PixelDst) + (Dst.RawImage.Description.BitsPerPixel shr 3);
-      PixelSrc := Pointer(PixelSrc) + 1;
-    end;
-    inc(yDst);
-    inc(ySrc);
+      PixelSrc := Pointer(PixelSrc) + (Src.RawImage.Description.BitsPerPixel shr 3);
+    end;
   end;
   src.EndUpdate;