Changeset 120 for trunk

Timestamp:

Feb 3, 2018, 5:03:31 PM (7 years ago)

Author:

chronos

Message:

• Added: Special Delphi random number generator algorithm. It is needed to correctly open stored books. Saved games depends on stored randseed and random generator algorithm which is pretty bad design.

Location:

trunk

Files:

• Database.pas (modified) (22 diffs)
• GameServer.pas (modified) (5 diffs)
• LocalPlayer/Diagram.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (2 diffs)
• Protocol.pas (modified) (3 diffs)

trunk/Database.pas

@@ -652 +652 @@
 {$IFNDEF SCR} if x = 1 then
       v := pi / 2 { first wave goes horizontal }
-    else {$ENDIF} v := Random * 2 * pi;
+    else {$ENDIF} v := DelphiRandom * 2 * pi;
     sa[x] := sin(v) / lx;
     ca[x] := cos(v) / ly;
@@ -786 +786 @@
               begin
                 inc(AreaCount[xBlock, yBlock]);
-                if Random(AreaCount[xBlock, yBlock]) = 0 then
+                if DelphiRandom(AreaCount[xBlock, yBlock]) = 0 then
                   RareByArea[xBlock, yBlock] := Loc0
               end
@@ -857 +857 @@
           begin
             inc(Cnt);
-            if Random(Cnt) = 0 then
+            if DelphiRandom(Cnt) = 0 then
             begin
               xworst := x;
@@ -908 +908 @@
               begin
                 inc(Cnt);
-                if Random(Cnt) = 0 then
+                if DelphiRandom(Cnt) = 0 then
                 begin
                   iBest := i;
@@ -996 +996 @@
       p := Zone[z0, i] * (1 - ZPlus) + Zone[z0 + 1, i] * ZPlus;
       { weight between zones z0 and z0+1 }
-      if Random * p0 < p then
+      if DelphiRandom * p0 < p then
       begin
         RndLow := i;
@@ -1136 +1136 @@
     if plus > MapSize then
       plus := MapSize;
-    Loc0 := Random(MapSize);
+    Loc0 := DelphiRandom(MapSize);
     for n := 0 to plus - 1 do
     begin
@@ -1147 +1147 @@
 
   for Loc0 := 0 to MapSize - 1 do
-    if (RealMap[Loc0] = fGrass) and (Random(100) < ShRandHills) then
+    if (RealMap[Loc0] = fGrass) and (DelphiRandom(100) < ShRandHills) then
       RealMap[Loc0] := RealMap[Loc0] or fHills;
 
@@ -1156 +1156 @@
   for n := 0 to unification * MapSize div 100 do
   begin
-    y := Random(ly);
-    if abs(y - (ly shr 1)) > ly div 4 + Random(ly * hotunification div 100) then
+    y := DelphiRandom(ly);
+    if abs(y - (ly shr 1)) > ly div 4 + DelphiRandom(ly * hotunification div 100) then
       if y < ly shr 1 then
         y := ly shr 1 - y
       else
         y := 3 * ly shr 1 - y;
-    Loc0 := lx * y + Random(lx);
+    Loc0 := lx * y + DelphiRandom(lx);
     if RealMap[Loc0] and fTerrain = fGrass then
     begin
-      Dir := Random(4);
+      Dir := DelphiRandom(4);
       Loc1 := dLoc(Loc0, Dir and 1 * 2 - 1, Dir shr 1 * 2 - 1);
       if (Loc1 >= 0) and (RealMap[Loc1] and fTerrain = fGrass) then
@@ -1198 +1198 @@
     if RealMap[Loc0] and fTerrain = fGrass then
     begin // change grassland to swamp
-      if Random(100) < ShSwamp then
+      if DelphiRandom(100) < ShSwamp then
         RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fSwamp;
     end;
@@ -1373 +1373 @@
     end;
     FillChar(nCityLoc, SizeOf(nCityLoc), 0);
-    Loc := Random(MapSize);
+    Loc := DelphiRandom(MapSize);
     for i := 0 to MapSize - 1 do
     begin
@@ -1414 +1414 @@
   begin // for all start continents
     if sccount[c] = 1 then
-      StartLoc0[p1] := CityLoc[c, Random(nCityLoc[c])]
+      StartLoc0[p1] := CityLoc[c, DelphiRandom(nCityLoc[c])]
     else
     begin
@@ -1431 +1431 @@
           if nRest = 0 then
             Break;
-          j := Random(nRest);
+          j := DelphiRandom(nRest);
           TestStartLoc[i] := RestLoc[j];
           RestLoc[j] := RestLoc[nRest - 1];
@@ -1494 +1494 @@
         if (Loc1 >= 0) and (Loc1 < MapSize) and
           (RealMap[Loc1] and fDeadLands = 0) then
-          if IsGoodTile(Loc1) and (Random(CntGood) < MinGood - CntGoodGrass + 1)
+          if IsGoodTile(Loc1) and (DelphiRandom(CntGood) < MinGood - CntGoodGrass + 1)
           then
           begin
@@ -1504 +1504 @@
             RealMap[Loc1] := RealMap[Loc1] and not fTerrain or fPrairie
           else if (RealMap[Loc1] and fTerrain in [fPrairie, fTundra, fSwamp])
-            and (Random(2) = 0) then
+            and (DelphiRandom(2) = 0) then
             RealMap[Loc1] := RealMap[Loc1] and not fTerrain or fForest;
       end;
@@ -1526 +1526 @@
     while i > 0 do
     begin
-      j := Random(nIrrLoc);
+      j := DelphiRandom(nIrrLoc);
       RealMap[IrrLoc[j]] := RealMap[IrrLoc[j]] or tiIrrigation;
       IrrLoc[j] := IrrLoc[nIrrLoc - 1];
@@ -1539 +1539 @@
     begin
       repeat
-        i := Random(nAlive) + 1
+        i := DelphiRandom(nAlive) + 1
       until StartLoc0[i] >= 0;
       StartLoc[p1] := StartLoc0[i];
@@ -1580 +1580 @@
         begin
           inc(n);
-          if Random(n) = 0 then
+          if DelphiRandom(n) = 0 then
             StartLoc2[p1] := Loc1;
         end;
@@ -1637 +1637 @@
           imax := nPrefStartLoc0;
         end;
-        i := Random(imax + 1);
+        i := DelphiRandom(imax + 1);
         StartLoc[p1] := StartLoc0[i];
         StartLoc2[p1] := StartLoc0[i];
@@ -1657 +1657 @@
   { !!!for Loc1:=0 to MapSize-1 do
     if RealMap[Loc1] and fterrain>=fGrass then
-    if random(3)=0 then RealMap[Loc1]:=RealMap[Loc1] or fRoad
-    else if random(3)=0 then RealMap[Loc1]:=RealMap[Loc1] or fRR;
+    if Delphirandom(3)=0 then RealMap[Loc1]:=RealMap[Loc1] or fRoad
+    else if Delphirandom(3)=0 then RealMap[Loc1]:=RealMap[Loc1] or fRR;
     {random Road and Railroad }
   { !!!for Loc1:=0 to MapSize-1 do
-    if (RealMap[Loc1] and fterrain>=fGrass) and (random(20)=0) then
+    if (RealMap[Loc1] and fterrain>=fGrass) and (Delphirandom(20)=0) then
     RealMap[Loc1]:=RealMap[Loc1] or fPoll; }
 
@@ -1782 +1782 @@
 procedure InitRandomGame;
 begin
-  RandSeed := RND;
+  DelphiRandSeed := RND;
   CalculatePrimitive;
   CreateElevation;
@@ -1792 +1792 @@
 procedure InitMapGame(Human: integer);
 begin
-  RandSeed := RND;
+  DelphiRandSeed := RND;
   FindContinents;
   PredefinedStartPositions(Human);
@@ -2770 +2770 @@
   i, dx, dy, dxMax, dyMax, Loc, NewOwner: integer;
 begin
+  if OriginLoc = -1 then
+    raise Exception.Create('Location error');
   i := 0;
   dyMax := 0;

trunk/GameServer.pas

@@ -295 +295 @@
   MapSize := lx * ly;
   LandMass := lm;
-  RandSeed := PreviewRND;
+  DelphiRandSeed := PreviewRND;
   if not PreviewElevation then
   begin
@@ -714 +714 @@
         bix[p1] := -1
       else
-        bix[p1] := bixFirstAI + random(nBrain - bixFirstAI)
+        bix[p1] := bixFirstAI + Delphirandom(nBrain - bixFirstAI)
     else
       bix[p1] := bixView[p1];
@@ -838 +838 @@
           RW[p].DefaultDebugMap := nil;
 
-        { !!!for i:=0 to nShipPart-1 do GShip[p].Parts[i]:=random((3-i)*2);{ }
+        { !!!for i:=0 to nShipPart-1 do GShip[p].Parts[i]:=Delphirandom((3-i)*2);{ }
       end;
 
@@ -1371 +1371 @@
     LandMass := NewLandMass;
   MaxTurn := NewMaxTurn;
-  Randomize;
-  RND := RandSeed;
+  DelphiRandomize;
+  RND := DelphiRandSeed;
   Mode := moPlaying;
   CL := TCmdList.Create;
@@ -1416 +1416 @@
   InitBrain(bixTerm);
 
-  Randomize;
+  DelphiRandomize;
   GAlive := 0;
   GWatching := 1;

trunk/LocalPlayer/Diagram.pas

@@ -68 +68 @@
 
     // stars
-    RandSeed := Player * 11111;
+    DelphiRandSeed := Player * 11111;
     for i := 1 to Width - 16 do
     begin
-      x := Random((Width - 16) * 200);
-      r := Random(13) + 28;
+      x := DelphiRandom((Width - 16) * 200);
+      r := DelphiRandom(13) + 28;
       Canvas.Pixels[x div 200 + 8, x mod 200 + Top] :=
         (r * r * r * r div 10001) * $10101;

trunk/LocalPlayer/Term.pas

@@ -1322 +1322 @@
       begin
         inc(CountBest);
-        if random(CountBest) = 0 then
+        if DelphiRandom(CountBest) = 0 then
           result := j
       end
@@ -3502 +3502 @@
     AILogo[i] := nil;
   Canvas.Font.Assign(UniFont[ftSmall]);
-  InitButtons();
+  InitButtons;
   EOT.Template := Templates;
 end;

trunk/Protocol.pas

@@ -1283 +1283 @@
   end;
 
+  { TCity }
+
   TCity = packed record
     Loc, { location }
@@ -1632 +1634 @@
     { preLeo,preLighthouse, } preLeo);
 
+var
+  DelphiRandSeed: Integer;
+
 procedure MakeUnitInfo(p: integer; const u: TUn; var ui: TUnitInfo);
 procedure MakeModelInfo(p, mix: integer; const m: TModel; var mi: TModelInfo);
 function IsSameModel(const mi1, mi2: TModelInfo): boolean;
 function SpecialTile(Loc, TerrType, lx: integer): integer;
+function DelphiRandom(const pi_Max: Integer): Integer; overload;
+function DelphiRandom: Extended; overload;
+procedure DelphiRandomize;
 
 implementation
@@ -1757 +1765 @@
 end;
 
+function DelphiRandom(const pi_Max: Integer): Integer;
+var
+  Temp: LongInt;
+begin
+  Temp := LongInt(134775813 * DelphiRandSeed + 1);
+  DelphiRandSeed := Temp;
+  Result := (UInt64(Cardinal(pi_Max)) * UInt64(Cardinal(Temp))) shr 32;
+end;
+
+function DelphiRandom: Extended; overload;
+begin
+  Result := DelphiRandom(High(LongInt)) / High(LongInt);
+end;
+
+procedure DelphiRandomize;
+begin
+  Randomize;
+  DelphiRandSeed := RandSeed;
+end;
+
 initialization