Changeset 487 for trunk/LocalPlayer/Select.pas

Timestamp:

Dec 8, 2023, 11:39:45 PM (5 months ago)

Author:

chronos

Message:

• Added: Range checking for TPixelPointer record type.

File:

• trunk/LocalPlayer/Select.pas (modified) (4 diffs)

trunk/LocalPlayer/Select.pas

@@ -275 +275 @@
         begin // city size
           Brush.Color := $000000;
-          FillRect(rect(X - 4 - 11, Y + 1, X - 4 + 13, Y + 21));
+          FillRect(Rect(X - 4 - 11, Y + 1, X - 4 + 13, Y + 21));
           Brush.Color := $FFFFFF;
-          FillRect(rect(X - 4 - 12, Y, X - 4 + 12, Y + 20));
+          FillRect(Rect(X - 4 - 12, Y, X - 4 + 12, Y + 20));
           Brush.Style := TBrushStyle.bsClear;
           Font.Color := $000000;
@@ -286 +286 @@
       if Kind = kCityEvents then
       begin
-        first := -1;
+        First := -1;
         for J := 0 to nCityEventPriority - 1 do
           if (Flags and CityRepMask and CityEventPriority[J] <> 0) then
           begin
-            first := J;
+            First := J;
             Break;
           end;
-        if first >= 0 then
+        if First >= 0 then
         begin
           I := 0;
           Test := 1;
-          while Test < CityEventPriority[first] do
+          while Test < CityEventPriority[First] do
           begin
             Inc(I);
@@ -303 +303 @@
           end;
           S := CityEventName(I);
-          { if CityEventPriority[first]=chNoGrowthWarning then
-            if Built[imAqueduct]=0 then
-            S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-            else begin S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); I:=17 end; }
+          { if CityEventPriority[First] = chNoGrowthWarning then
+            if Built[imAqueduct] = 0 then
+            S := Format(S, [Phrases.Lookup('IMPROVEMENTS', imAqueduct)])
+            else begin S := Format(S, [Phrases.Lookup('IMPROVEMENTS', imSewer)]); I := 17 end; }
           ReplaceText(X + (CityNameSpace + 4 + 40 + 18 + 8), Y, TextColor, S);
           if NonText then
@@ -313 +313 @@
               y0 + 1, 18, 18, 1 + I mod 3 * 19, 1 + I div 3 * 19);
             X := InnerWidth - 26;
-            for J := nCityEventPriority - 1 downto first + 1 do
+            for J := nCityEventPriority - 1 downto First + 1 do
               if (Flags and CityRepMask and CityEventPriority[J] <> 0) then
               begin