Changeset 10 for trunk/Database.pas

Timestamp:

Jan 7, 2017, 2:33:20 PM (8 years ago)

Author:

chronos

Message:

• Modified: Created CevoComponents ackage for installable custom components.
• Fixed: Compile time range check error.
• Added: Heaptrace check and fixed some memory leaks.
• Fixed: MaskD function.

File:

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

trunk/Database.pas

@@ -79 +79 @@
   TVicinity21Loc = array [0 .. 27] of integer;
 
-procedure MaskD(var x; Count, Mask: Cardinal);
+procedure MaskD(var x: array of Cardinal; Count, Mask: Cardinal);
 procedure IntServer(Command, Player, Subject: integer; var Data);
 procedure CompactLists(p: integer);
@@ -171 +171 @@
   UnBuilt: array [0 .. nPl - 1] of integer; { number of units built }
 
-procedure MaskD(var x; Count, Mask: Cardinal);
-begin
-{ TODO
-  sub eax,4
-@r: and [eax+edx*4],ecx
-  dec edx
-  jnz @r
-  }
+procedure MaskD(var x: array of Cardinal; Count, Mask: Cardinal);
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+    x[I] := x[I] and Mask;
 end;
 
@@ -1659 +1657 @@
     RealMap[Loc1]:=RealMap[Loc1] or fPoll; }
 
-  FillChar(Occupant, MapSize, -1);
+  FillChar(Occupant, MapSize, Byte(-1));
   FillChar(ZoCMap, MapSize, 0);
   FillChar(ObserveLevel, MapSize * 4, 0);
-  FillChar(UsedByCity, MapSize * 4, -1);
+  FillChar(UsedByCity, MapSize * 4, Byte(-1));
   GTestFlags := 0;
   GInitialized := GAlive or GWatching;
@@ -1681 +1679 @@
         GetMem(Map, 4 * MapSize);
         GetMem(MapObservedLast, 2 * MapSize);
-        FillChar(MapObservedLast^, 2 * MapSize, -1);
+        FillChar(MapObservedLast^, 2 * MapSize, Byte(-1));
         GetMem(Territory, MapSize);
         FillChar(Territory^, MapSize, $FF);
@@ -1708 +1706 @@
             GetMem(EnemyReport[p1], SizeOf(TEnemyReport) - 2 *
               (INFIN + 1 - nmmax));
-            FillChar(EnemyReport[p1].Tech, nAdv, tsNA);
+            FillChar(EnemyReport[p1].Tech, nAdv, Byte(tsNA));
             EnemyReport[p1].TurnOfContact := -1;
             EnemyReport[p1].TurnOfCivilReport := -1;
@@ -1731 +1729 @@
         for Loc1 := 0 to MapSize - 1 do
           Map[Loc1] := fUNKNOWN;
-        FillChar(Tech, nAdv, tsNA);
+        FillChar(Tech, nAdv, Byte(tsNA));
         FillChar(NatBuilt, SizeOf(NatBuilt), 0);
       end;
@@ -1820 +1818 @@
 begin
   CalculatePrimitive;
-  FillChar(Occupant, MapSize, -1);
+  FillChar(Occupant, MapSize, Byte(-1));
   FillChar(ObserveLevel, MapSize * 4, 0);
   with RW[0] do
@@ -1827 +1825 @@
     GetMem(Map, 4 * MapSize);
     GetMem(MapObservedLast, 2 * MapSize);
-    FillChar(MapObservedLast^, 2 * MapSize, -1);
+    FillChar(MapObservedLast^, 2 * MapSize, Byte(-1));
     GetMem(Territory, MapSize);
     FillChar(Territory^, MapSize, $FF);
@@ -2693 +2691 @@
   if Mode = moLoading_Fast then
     exit;
-  MaskD(RW[p].Map^, MapSize, not Cardinal(fInEnemyZoC));
+  MaskD(RW[p].Map^, MapSize, Cardinal(not Cardinal(fInEnemyZoC)));
   ObserveMask := 3 shl (2 * p);
   for Loc := 0 to MapSize - 1 do
@@ -2721 +2719 @@
   if Mode <> moPlaying then
     exit;
-  MaskD(RW[p].Map^, MapSize, not Cardinal(fPeace));
+  MaskD(RW[p].Map^, MapSize, Cardinal(not Cardinal(fPeace)));
   for p1 := -1 to nPl - 1 do
     PeacePlayer[p1] := (p1 >= 0) and (p1 <> p) and (1 shl p1 and GAlive <> 0)
@@ -2829 +2827 @@
   end;
 
-  FillChar(Country, MapSize, -1);
+  FillChar(Country, MapSize, Byte(-1));
   for Loc := 0 to MapSize - 1 do
     Dist[Loc] := CountryRadius + 1;