Changeset 136 for trunk

Timestamp:

May 3, 2018, 11:18:29 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Update background texture in city dialog after age change.

File:

• trunk/LocalPlayer/CityScreen.pas (modified) (21 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -90 +90 @@
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories,
-
-  Math;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math;
 
 {$R *.lfm}
@@ -258 +256 @@
   begin
     AgePrepared := MainTextureAge;
+
+    // TODO: FillRect should not be needed as BitBlt is with SRCCOPY
+    Back.Canvas.FillRect(0, 0, ClientWidth, ClientHeight);
+
     bitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas.Handle, 0, 0, SRCCOPY);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
-  end
+  end;
 end;
 
 procedure TCityDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
@@ -319 +321 @@
             11 + 12 * (i mod 18 div 3)));
           break;
-        end
+        end;
     end;
     i := 30;
@@ -345 +347 @@
             3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
             11 + 12 * (i mod 18 div 3)));
-        end
-      end
+        end;
+      end;
     end;
     brush.style := bsClear;
-  end
+  end;
 end;
 
@@ -370 +372 @@
         wZoomEnvironment, hZoomMap);
     end;
-  end
+  end;
 end;
 
@@ -431 +433 @@
       Sprite(offscreen, HGrSystem, x + xxt - 5 + d * (2 * i + 1 - Total),
         y + yyt - 5, 10, 10, xGr, yGr);
-    end
+    end;
   end;
 
@@ -492 +494 @@
         16 * line, s);
       inc(line)
-    end
+    end;
   end;
 
@@ -602 +604 @@
         LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40, ymOpt - 1,
           copy(s, j + 1, 255));
-      end
-    end
+      end;
+    end;
   end;
 
@@ -999 +1001 @@
           yView + 5 + 40));
         brush.style := bsClear;
-      end
+      end;
     end
     else if AllowChange and (c.Status and 7 <> 0) then
@@ -1303 +1305 @@
                     if WindowMode <> wmModal then
                       MainScreen.UpdateViews;
-                  end
-                end
-              end
-            end
-      end
+                  end;
+                end;
+              end;
+            end;
+      end;
     end
     else if (Mode = mSupp) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
@@ -1326 +1328 @@
           Close;
           MainScreen.CityClosed(imix[i], false, true);
-        end
+        end;
     end
     else if (x >= xmArea - 192) and (x < xmArea + 192) and (y >= ymArea - 96)
@@ -1375 +1377 @@
             if WindowMode <> wmModal then
               MainScreen.UpdateViews;
-          end
-        end
+          end;
+        end;
     end
     else if (ClientMode < scContact) and (cGov <> gAnarchy) and
@@ -1413 +1415 @@
           if WindowMode <> wmModal then
             MainScreen.UpdateViews;
-        end
-      end
+        end;
+      end;
     end;
 end; { FormMouseDown }
@@ -1508 +1510 @@
                 'MSG_DEFAULT') = mrOK
           end;
-        end
+        end;
       end;
       if not QueryOk then
@@ -1581 +1583 @@
         if WindowMode <> wmModal then
           MainScreen.UpdateViews;
-      end
-    end
-  end
+      end;
+    end;
+  end;
 end;
 
@@ -1651 +1653 @@
         ImpImage(Canvas, xView + 9, yView + 5, c.Project0 and cpIndex,
           cGov, true);
-    end
-  end
+    end;
+  end;
 end;
 
@@ -1741 +1743 @@
     ChangeCity(+1)
   else
-    inherited
+    inherited;
 end;
 
@@ -1758 +1760 @@
     dec(Page);
     SmartUpdateContent
-  end
+  end;
 end;
 
@@ -1767 +1769 @@
     inc(Page);
     SmartUpdateContent
-  end
+  end;
 end;
 
@@ -1785 +1787 @@
     if Advice.Tiles <> MyCity[cix].Tiles then
       Server(sSetCityTiles, me, cix, Advice.Tiles);
-  end
+  end;
 end;
 
@@ -1798 +1800 @@
       k := ImpSorted[i];
       ImpSorted[i] := ImpSorted[j];
-      ImpSorted[j] := k
+      ImpSorted[j] := k;
     end;