Changeset 590 for trunk

Timestamp:

Jul 24, 2024, 10:25:56 PM (4 months ago)

Author:

chronos

Message:

• Modified: Map load and save moved to separate class TMap.

Location:

trunk

Files:

• Database.pas (modified) (9 diffs)
• GameServer.pas (modified) (11 diffs)
• Integrated.lpi (modified) (2 diffs)
• Map.pas (added)
• MiniMap.pas (modified) (3 diffs)

trunk/Database.pas

@@ -7 +7 @@
 
 uses
-  SysUtils, Protocol, CmdList;
+  SysUtils, Protocol, CmdList, Map;
 
 const
@@ -120 +120 @@
 function MapGeneratorAvailable: Boolean;
 procedure CreateElevation;
-procedure CreateMap(preview: Boolean);
+procedure CreateMap(Preview: Boolean);
 procedure InitMapEditor;
 procedure ReleaseMapEditor;
@@ -970 +970 @@
 end;
 
-procedure CreateMap(preview: Boolean);
+procedure CreateMap(Preview: Boolean);
 const
   ShHiHills = 6; { of land }
@@ -1089 +1089 @@
 
 var
-  X, Y, N, Dir, plus, Count, Loc0, Loc1, bLand, bHills, bMountains, V8: Integer;
+  X, Y, N, Dir, Plus, Count, Loc0, Loc1, bLand, bHills, bMountains, V8: Integer;
   CopyFrom: array [0 .. lxmax * lymax - 1] of Integer;
   Adjacent: TVicinity8Loc;
@@ -1095 +1095 @@
 begin
   FillChar(RealMap, MapSize * SizeOf(Cardinal), 0);
-  plus := 0;
+  Plus := 0;
   bMountains := 256;
-  while plus < MapSize * LandMass * ShMountains div 10000 do
+  while Plus < MapSize * LandMass * ShMountains div 10000 do
   begin
     Dec(bMountains);
-    Inc(plus, ElCount[bMountains]);
-  end;
-  Count := plus;
-  plus := 0;
+    Inc(Plus, ElCount[bMountains]);
+  end;
+  Count := Plus;
+  Plus := 0;
   bHills := bMountains;
-  while plus < MapSize * LandMass * ShHiHills div 10000 do
+  while Plus < MapSize * LandMass * ShHiHills div 10000 do
   begin
     Dec(bHills);
-    Inc(plus, ElCount[bHills]);
-  end;
-  Inc(Count, plus);
+    Inc(Plus, ElCount[bHills]);
+  end;
+  Inc(Count, Plus);
   bLand := bHills;
   while Count < MapSize * LandMass div 100 do
@@ -1144 +1144 @@
     end;
 
-  if not preview then
-  begin
-    plus := 36 * 56 * 20 * ShTestRiver div (LandMass * 100);
-    if plus > MapSize then
-      plus := MapSize;
+  if not Preview then
+  begin
+    Plus := 36 * 56 * 20 * ShTestRiver div (LandMass * 100);
+    if Plus > MapSize then
+      Plus := MapSize;
     Loc0 := DelphiRandom(MapSize);
-    for N := 0 to plus - 1 do
+    for N := 0 to Plus - 1 do
     begin
       if (RealMap[Loc0] and fTerrain >= fGrass) and (Loc0 >= lx) and
@@ -1267 +1267 @@
       ($F shl 27);
 
-  if not preview then
+  if not Preview then
   begin
     FindContinents;
@@ -1941 +1941 @@
 // cix=-2 - don't search city, don't calculate city benefits, just government of player p
 var
-  p0, Tile, special: Integer;
+  p0, Tile, Special: Integer;
 begin
   with Info do
@@ -1971 +1971 @@
     end; // no city found here
 
-    special := Tile and fSpecial and ResourceMask[P] shr 5;
+    Special := Tile and fSpecial and ResourceMask[P] shr 5;
     with Terrain[Tile and fTerrain] do
     begin
-      Food := FoodRes[special];
-      Prod := ProdRes[special];
-      Trade := TradeRes[special];
-      if (special > 0) and (Tile and fTerrain <> fGrass) and
+      Food := FoodRes[Special];
+      Prod := ProdRes[Special];
+      Trade := TradeRes[Special];
+      if (Special > 0) and (Tile and fTerrain <> fGrass) and
         (RW[P].NatBuilt[imSpacePort] > 0) then
       begin // GeoSat effect

trunk/GameServer.pas

@@ -8 +8 @@
 uses
   Protocol, Database, DynLibs, Platform, DateUtils, LazFileUtils, Brain, Global,
+  Map,
   {$IFDEF DPI}Graphics{$ELSE}Graphics{$ENDIF};
 
@@ -73 +74 @@
 function LoadGame(const FileName: string; Turn: Integer;
   MovieMode: Boolean): Boolean;
-procedure EditMap(const Map: string; Newlx, Newly, NewLandMass: Integer);
+procedure EditMap(const AMapFileName: string; Newlx, Newly, NewLandMass: Integer);
 procedure DirectHelp(Command: Integer);
 function ToAutoSaveFileName(FileName: string): string;
@@ -80 +81 @@
 procedure ChangeClient;
 procedure NextPlayer;
-function PreviewMap(lm: Integer): Pointer;
+function PreviewMap(ALandMass: Integer): Pointer;
 
 
@@ -283 +284 @@
 end;
 
-function PreviewMap(lm: Integer): Pointer;
+function PreviewMap(ALandMass: Integer): Pointer;
 begin
   lx := lxmax;
   ly := lymax;
   MapSize := lx * ly;
-  LandMass := lm;
+  LandMass := ALandMass;
   DelphiRandSeed := PreviewRND;
   if not PreviewElevation then
@@ -563 +564 @@
 end;
 
-procedure SaveMap(FileName: string);
-var
-  I: Integer;
-  MapFile: TFileStream;
-  S: string[255];
-begin
-  MapFile := TFileStream.Create(FileName, fmCreate or fmShareExclusive);
-  try
-    MapFile.Position := 0;
-    S := 'cEvoMap'#0;
-    MapFile.Write(S[1], 8); { file id }
-    I := 0;
-    MapFile.Write(I, 4); { format id }
-    MapFile.Write(MaxTurn, 4);
-    MapFile.Write(lx, 4);
-    MapFile.Write(ly, 4);
-    MapFile.Write(RealMap, MapSize * 4);
-  finally
-    FreeAndNil(MapFile);
-  end;
-end;
-
-function LoadMap(FileName: string): Boolean;
-var
-  I, Loc1: Integer;
-  MapFile: TFileStream;
-  S: string[255];
-begin
-  Result := False;
-  if not FileExists(FileName) then Exit;
-  MapFile := TFileStream.Create(FileName, fmOpenRead or fmShareExclusive);
-  try
-    MapFile.Position := 0;
-    MapFile.Read(S[1], 8); { file id }
-    MapFile.Read(I, 4); { format id }
-    if I = 0 then
-    begin
-      MapFile.Read(I, 4); // MaxTurn
-      MapFile.Read(lx, 4);
-      MapFile.Read(ly, 4);
-      ly := ly and not 1;
-      if lx > lxmax then
-        lx := lxmax;
-      if ly > lymax then
-        ly := lymax;
-      MapSize := lx * ly;
-      MapFile.Read(RealMap, MapSize * 4);
-      for Loc1 := 0 to MapSize - 1 do
-      begin
-        RealMap[Loc1] := RealMap[Loc1] and
-          ($7F01FFFF or fPrefStartPos or fStartPos) or ($F shl 27);
-        if RealMap[Loc1] and (fTerrain or fSpecial) = fSwamp or fSpecial2 then
-          RealMap[Loc1] := RealMap[Loc1] and not (fTerrain or fSpecial) or
-            (fSwamp or fSpecial1);
-        if (RealMap[Loc1] and fDeadLands <> 0) and
-          (RealMap[Loc1] and fTerrain <> fArctic) then
-          RealMap[Loc1] := RealMap[Loc1] and not (fTerrain or fSpecial)
-            or fDesert;
-      end;
-      Result := True;
-    end;
-  finally
-    FreeAndNil(MapFile);
-  end;
-end;
-
 procedure SaveGame(FileName: string; Auto: Boolean);
 var
@@ -717 +652 @@
   BrainUsed: Set of 0 .. 254; { used brains }
   AIBrains: TBrains;
+  Map: TMap;
 begin
   for p1 := 0 to nPl - 1 do begin
@@ -865 +801 @@
   else
   begin // predefined map
-    if Mode = moPlaying then
-      LoadMap(MapFileName); // new game -- load map from file
+    if Mode = moPlaying then begin
+      Map := TMap.Create;
+      Map.LoadFromFile(MapFileName); // new game -- load map from file
+      MapSize := Map.MapSize;
+      lx := Map.Size.X;
+      ly := Map.Size.Y;
+      Move(Map.Tiles[0], RealMap, MapSize * 4);
+      FreeAndNil(Map);
+    end;
     GetMem(MapField, MapSize * 4);
     Move(RealMap, MapField^, MapSize * 4);
@@ -1419 +1362 @@
 end;
 
-procedure EditMap(const Map: string; Newlx, Newly, NewLandMass: Integer);
+procedure EditMap(const AMapFileName: string; Newlx, Newly, NewLandMass: Integer);
 var
   p1, Loc1: Integer;
   Game: TNewGameData;
+  Map: TMap;
 begin
   Notify(ntStartDone);
   Notify(ntInitLocalHuman);
-  MapFileName := Map;
+  MapFileName := AMapFileName;
   lx := Newlx;
   ly := Newly;
@@ -1438 +1382 @@
   GAlive := 0;
   GWatching := 1;
-  if not LoadMap(MapFileName) then
-    for Loc1 := 0 to MapSize - 1 do
-      RealMap[Loc1] := fOcean or ($F shl 27);
+  for Loc1 := 0 to MapSize - 1 do
+    RealMap[Loc1] := fOcean or ($F shl 27);
+  if FileExists(MapFileName) then begin
+    Map := TMap.Create;
+    Map.LoadFromFile(MapFileName);
+    MapSize := Map.MapSize;
+    lx := Map.Size.X;
+    ly := Map.Size.Y;
+    Move(Map.Tiles[0], RealMap, MapSize * 4);
+    FreeAndNil(Map);
+  end;
   CL := nil;
   InitMapEditor;
@@ -2720 +2672 @@
   ShowNegoData: TShowNegoData;
   Logged, Ok, HasShipChanged, AllHumansDead, OfferFullySupported: Boolean;
+  Map: TMap;
 begin
   if Command = sTurn then
@@ -3295 +3248 @@
       if Player = 0 then
       begin
-        if Command = sSaveMap then
-          SaveMap(MapFileName);
+        if Command = sSaveMap then begin
+          Map := TMap.Create;
+          Map.Size := Point(lx, ly);
+          Map.MaxTurn := MaxTurn;
+          Move(RealMap, Map.Tiles[0], MapSize * 4);
+          Map.SaveToFile(MapFileName);
+          FreeAndNil(Map);
+        end;
         Notify(ntBackOn);
         BrainTerm.Client(cBreakGame, -1, nil^);

trunk/Integrated.lpi

@@ -108 +108 @@
       </Item4>
     </RequiredPackages>
-    <Units Count="47">
+    <Units Count="48">
       <Unit0>
         <Filename Value="Integrated.lpr"/>
@@ -369 +369 @@
         <IsPartOfProject Value="True"/>
       </Unit46>
+      <Unit47>
+        <Filename Value="Map.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit47>
     </Units>
   </ProjectOptions>

trunk/MiniMap.pas

@@ -5 +5 @@
 
 uses
-  Classes, SysUtils, Protocol, ClientTools,
+  Classes, SysUtils, Protocol, ClientTools, Map,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Common{$ELSE}Graphics{$ENDIF};
 
@@ -111 +111 @@
 procedure TMiniMap.LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
 var
-  x, y, lxFile, lyFile: integer;
-  MapFile: file;
-  s: string[255];
+  x, y: integer;
   MapRow: array [0 .. lxmax - 1] of Cardinal;
   ImageFileName: string;
+  Map: TMap;
+  Tile: Cardinal;
 begin
   ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + CevoMapPictureExt;
@@ -125 +125 @@
     if Bitmap.Height > MaxHeightMapLogo then
       Bitmap.Height := MaxHeightMapLogo;
-    Size.X := Bitmap.Width div 2;
-    Size.Y := Bitmap.Height;
+    Size := Point(Bitmap.Width div 2, Bitmap.Height);
   end else begin
     Mode := mmNone;
-    Size.X := MaxWidthMapLogo;
-    Size.Y := MaxHeightMapLogo;
-  end;
-
-  AssignFile(MapFile, FileName);
+    Size := Point(MaxWidthMapLogo, MaxHeightMapLogo);
+  end;
+
+  Map := TMap.Create;
   try
-    Reset(MapFile, 4);
-    BlockRead(MapFile, s[1], 2); { file id }
-    BlockRead(MapFile, x, 1); { format id }
-    BlockRead(MapFile, x, 1); // MaxTurn
-    BlockRead(MapFile, lxFile, 1);
-    BlockRead(MapFile, lyFile, 1);
+    Map.LoadFromFile(FileName);
     nMapLandTiles := 0;
     nMapStartPositions := 0;
-    for y := 0 to lyFile - 1 do begin
-      BlockRead(MapFile, MapRow, lxFile);
-      for x := 0 to lxFile - 1 do
-      begin
-        if (MapRow[x] and fTerrain) in [fGrass, fPrairie, fTundra, fSwamp,
+    for y := 0 to Map.Size.Y - 1 do begin
+      for X := 0 to Map.Size.X - 1 do begin
+        Tile := Map.Tiles[Y * Map.Size.X + X];
+        if (Tile and fTerrain) in [fGrass, fPrairie, fTundra, fSwamp,
           fForest, fHills] then
           Inc(nMapLandTiles);
-        if MapRow[x] and (fPrefStartPos or fStartPos) <> 0 then
+        if Tile and (fPrefStartPos or fStartPos) <> 0 then
           Inc(nMapStartPositions);
-      end
+      end;
     end;
     if nMapStartPositions > nPl then
       nMapStartPositions := nPl;
-    CloseFile(MapFile);
-  except
-    CloseFile(MapFile);
+  finally
+    FreeAndNil(Map);
   end;
 end;