Changeset 45 for trunk

Timestamp:

Jan 10, 2017, 12:11:21 AM (8 years ago)

Author:

chronos

Message:

• Fixed: Range check error in territory borders evaluation.

File:

• trunk/Database.pas (modified) (3 diffs)

trunk/Database.pas

@@ -1081 +1081 @@
 
 begin
-  FillChar(RealMap, MapSize * 4, 0);
+  FillChar(RealMap, MapSize * SizeOf(Cardinal), 0);
   plus := 0;
   bMountains := 256;
@@ -2798 +2798 @@
 // player's territory, -1 for full border recalculation
 var
-  i, r, Loc, Loc1, dx, dy, p1, p2, cix, NewDist, dxMax, dyMax, OldOwner, V8,
-    NewOwner: integer;
+  i, r, Loc, Loc1, dx, dy, p1, p2, cix, NewDist, dxMax, dyMax, OldOwner, V8: Integer;
+  NewOwner: Cardinal;
   Adjacent: TVicinity8Loc;
   AtPeace: array [0 .. nPl, 0 .. nPl] of boolean;
@@ -2907 +2907 @@
               else
                 ChangeTerritory(Loc, NewOwner);
-            inc(BorderChanges[i div 8], NewOwner shl (i mod 8 * 4));
+            BorderChanges[i shr 3] := BorderChanges[i shr 3] or
+              ((NewOwner shl ((i and 7) * 4)) and $ffffffff);
           end;
           inc(i);
-        end
-    end
+        end;
+    end;
   end
   else