Changeset 60 for trunk/Protocol.pas

Timestamp:

Jan 13, 2017, 6:51:27 PM (7 years ago)

Author:

chronos

Message:

• Fixed: City mini map was drawn incorrectly.

File:

• trunk/Protocol.pas (modified) (7 diffs)

trunk/Protocol.pas

@@ -1196 +1196 @@
 mcLine = 26;
 mcFirstNonCap = mcNav;
-AutoFeature:
-Set of mcFirstNonCap .. nFeature - 1 = [mcNav, mcSE, mcNP, mcJet, mcAcademy];
+AutoFeature: set of mcFirstNonCap .. nFeature - 1 = [mcNav, mcSE, mcNP, mcJet,
+  mcAcademy];
 // unit class advances, automatically applied if available
 
-Feature:
-array [0 .. nFeature - 1] of { unit model features }
+Feature: array [0 .. nFeature - 1] of { unit model features }
   record Domains, Preq, Weight, Cost: integer;
 end
@@ -1232 +1231 @@
   (Domains: 7; Preq: adMassProduction; Weight: 0; Cost: 0)); { mcLine }
 
-WeightPreq7:
-array [0 .. nDomains - 1] of integer = (adHorsebackRiding, adSeafaring,
+WeightPreq7: array [0 .. nDomains - 1] of integer = (adHorsebackRiding, adSeafaring,
   adAdvancedFlight);
-WeightPreq10:
-array [0 .. nDomains - 1] of integer = (adAutomobile, adSteel, preNA);
+WeightPreq10: array [0 .. nDomains - 1] of integer = (adAutomobile, adSteel, preNA);
 
 INFIN = 999999;
@@ -1333 +1330 @@
     Exp, { micro experience, the level is Exp div ExpCost }
     Load: Byte; { number of transported units }
-    Flags: word end;
-
-    TCityInfo = packed record Loc, Status, // free for AI use
+    Flags: word;
+  end;
+
+  TCityInfo = packed record
+    Loc, Status, // free for AI use
     SavedStatus: LongInt; // for server internal use only
     Owner, // last known owner, even if not alive anymore!
@@ -1398 +1397 @@
 
   TTileInfo = record
-    Food, Prod, Trade, ExplCity: integer end;
-    TCityReport = record HypoTiles, HypoTax, HypoLux, Working, Happy, FoodRep,
+    Food, Prod, Trade, ExplCity: integer;
+  end;
+
+  TCityReport = record
+    HypoTiles, HypoTax, HypoLux, Working, Happy, FoodRep,
       ProdRep, Trade, PollRep, Corruption, Tax, Lux, Science, Support, Eaten,
       ProdCost, Storage, Deployed: integer;
@@ -1432 +1434 @@
   TGetCityData = record
     Owner: integer;
-    c: TCity end;
-    TCityAreaInfo = record Available: array [0 .. 26] of integer;
+    c: TCity;
+  end;
+
+  TCityAreaInfo = record
+    Available: array [0 .. 26] of integer;
   end;
 
@@ -1461 +1466 @@
     Ship1Change, Ship2Change: array [0 .. nShipPart - 1] of integer;
   end;
-  TOffer = record nDeliver, nCost: integer;
+  TOffer = record
+    nDeliver, nCost: integer;
     Price: array [0 .. 11] of Cardinal;
   end;
@@ -1627 +1633 @@
 
 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;
+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;
 
 implementation