Changeset 3 for trunk

Timestamp:

Jan 7, 2017, 11:03:42 AM (8 years ago)

Author:

chronos

Message:

• Fixed: Correctly build under Delphi 10.0.

Location:

trunk

Files:

• . (modified) (1 prop)
• Integrated.dproj (added)
• LocalPlayer (modified) (1 prop)
• LocalPlayer/CityScreen.dfm (modified) ( previous)
• LocalPlayer/CityScreen.pas (modified) (2 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -438 +438 @@
 x,y,xGr,i,i1,j,iix,d,dx,dy,PrCost,Cnt,Loc1,FreeSupp,Paintiix,HappyGain,
   OptiType,rx,ry,TrueFood,TrueProd,TruePoll: integer;
+av: Integer;
 PrName,s:string;
 UnitInfo: TUnitInfo;
@@ -547 +548 @@
       begin
       Loc1:=dLoc(cLoc,dx,dy);
-      if (CityAreaInfo.Available[(dy+3) shl 2+(dx+3) shr 1] in [faNotAvailable,faTreaty,faInvalid])
+      av := CityAreaInfo.Available[(dy+3) shl 2+(dx+3) shr 1];
+      if ((av = faNotAvailable) or (av = faTreaty) or (av =faInvalid))
         and ((Loc1<0) or (Loc1>=G.lx*G.ly) or (MyMap[Loc1] and fCity=0)) then
         Sprite(offscreen,HGrTerrain,xmArea-xxt+xxt*dx,ymArea-yyt+yyt*dy,xxt*2,