Changeset 401 for trunk

Timestamp:

Nov 2, 2021, 9:25:33 AM (3 years ago)

Author:

chronos

Message:

• Modified: Use LXD for snap creation.
• Modified: Code cleanup.

Location:

trunk

Files:

• AI/StdAI/libstdai-amd64.so (modified) ( previous)
• Install/snap/local/build.sh (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (3 diffs)
• Protocol.pas (modified) (1 diff)

trunk/Install/snap/local/build.sh

@@ -4 +4 @@
 
 pushd ../../..
-snapcraft --debug
+snapcraft --debug --use-lxd
 popd
 

trunk/LocalPlayer/IsoEngine.pas

@@ -1007 +1007 @@
   end;
 
-  if ShowObjects then
-  begin
-    if (Tile and fCanal <> 0) or (Tile and fCity <> 0) then
-    begin // paint canal connections
+  if ShowObjects then begin
+    // Paint canal connections
+    if (Tile and fCanal <> 0) or (Tile and fCity <> 0) then begin
       Conn := Connection8(Loc, fCanal or fCity);
       if Tile and fCanal <> 0 then
         Conn := Conn or ($FF - OceanConnection(Loc));
-      if Conn = 0 then
-      begin
+      if Conn = 0 then begin
         if Tile and fCanal <> 0 then
-          TSprite(x, y, spCanal)
+          TSprite(x, y, spCanal);
       end
       else
@@ -1024 +1022 @@
             TSprite(x, y, spCanal + 1 + Dir);
     end;
+
     if Tile and (fRR or fCity) <> 0 then
       RRConn := Connection8(Loc, fRR or fCity)
     else
       RRConn := 0;
-    if Tile and (fRoad or fRR or fCity) <> 0 then
-    begin // paint road connections
+
+    // Paint road connections
+    if Tile and (fRoad or fRR or fCity) <> 0 then begin
       Conn := Connection8(Loc, fRoad or fRR or fCity) and not RRConn;
       if (Conn = 0) and (Tile and (fRR or fCity) = 0) then
@@ -1038 +1038 @@
             TSprite(x, y, spRoad + 1 + Dir);
     end;
-    // paint railroad connections
+
+    // Paint railroad connections
     if (Tile and fRR <> 0) and (RRConn = 0) then
       TSprite(x, y, spRailRoad)
-    else if RRConn > 0 then
+    else if RRConn > 0 then begin
       for Dir := 0 to 7 do
         if (1 shl Dir) and RRConn <> 0 then
           TSprite(x, y, spRailRoad + 1 + Dir);
+    end;
   end;
 end;

trunk/Protocol.pas

@@ -378 +378 @@
   fRiver = $00000080;
   fRoad = $00000100;
-  fRR = $00000200;
+  fRR = $00000200; // railroad
   fCanal = $00000400;
   fPoll = $00000800;