Changeset 60 for trunk/LocalPlayer

Timestamp:

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

Author:

chronos

Message:

• Fixed: City mini map was drawn incorrectly.

Location:

trunk/LocalPlayer

Files:

• BaseWin.pas (modified) (1 diff)
• CityScreen.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);