Changeset 70 for trunk

Timestamp:

Jan 14, 2017, 10:42:14 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Slightly different behaviour of scrollbar under Linux and Windows.
• Modified: Disable assert for city optimization to be able to play in Debug mode.

Location:

trunk/LocalPlayer

Files:

• ClientTools.pas (modified) (1 diff)
• PVSB.pas (modified) (1 diff)

trunk/LocalPlayer/ClientTools.pas

@@ -570 +570 @@
           Done := true;
           for cix := 0 to MyRO.nCity - 1 do
-            if CityNeedsOptimize[cix] then
-            begin
-              OptiType := MyCity[cix].Status shr 4 and $0F;
-              if OptiType <> 0 then
-              begin
+            if CityNeedsOptimize[cix] then begin
+              OptiType := (MyCity[cix].Status shr 4) and $0F;
+              if OptiType <> 0 then begin
                 Advice.ResourceWeights := OfferedResourceWeights[OptiType];
                 Server(sGetCityTileAdvice, me, cix, Advice);
                 if Advice.Tiles <> MyCity[cix].Tiles then
-                  if CheckOnly then
-                    assert(false)
-                  else
-                  begin
+                  if CheckOnly then begin
+                    // TODO: What is this assert for?
+                    // Need to optimize city tiles but CheckOnly true?
+                    //assert(false)
+                  end else begin
                     for fix := 1 to 26 do
                       if MyCity[cix].Tiles and not Advice.Tiles and

trunk/LocalPlayer/PVSB.pas

@@ -188 +188 @@
 begin
   ScrollBar.Min := si.nMin;
-  ScrollBar.Max := Max(si.nMax - si.nPage + 1, 0);
+  ScrollBar.Max := Max(si.nMax{$IFDEF LINUX} - si.nPage + 1{$ENDIF}, 0);
   ScrollBar.PageSize := si.nPage;
   ScrollBar.Position := si.nPos;