Changeset 310 for trunk

Timestamp:

Mar 15, 2021, 8:06:54 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Multiplayer with multiple local users didn't work on Linux.

File:

• trunk/LocalPlayer/Term.pas (modified) (5 diffs)

trunk/LocalPlayer/Term.pas

@@ -4072 +4072 @@
   TerrainTile: Cardinal;
 begin
+  if not Assigned(MyMap) then Exit;
   cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
   cmPolNone := GrExt[HGrSystem].Data.Canvas.Pixels[102, 67];
   hw := MapWidth div (xxt * 2);
-  with Mini.Canvas do
-  begin
+  with Mini.Canvas do begin
     Brush.Color := $000000;
     FillRect(Rect(0, 0, Mini.width, Mini.height));
@@ -4083 +4083 @@
   MiniPixel := PixelPointer(Mini);
   PrevMiniPixel := PixelPointer(Mini);
-  for y := 0 to ScaleToNative(G.ly) - 1 do
-  begin
-    for x := 0 to ScaleToNative(G.lx) - 1 do
-      if MyMap[ScaleFromNative(x) + G.lx * ScaleFromNative(y)] and fTerrain <> fUNKNOWN then
-      begin
-        Loc := ScaleFromNative(x) + G.lx * ScaleFromNative(y);
-        for i := 0 to 1 do
-        begin
+  for y := 0 to ScaleToNative(G.ly) - 1 do begin
+    for x := 0 to ScaleToNative(G.lx) - 1 do begin
+      Loc := ScaleFromNative(x) + G.lx * ScaleFromNative(y);
+      if (MyMap[Loc] and fTerrain) <> fUNKNOWN then begin
+        for i := 0 to 1 do begin
           xm := ((x - ScaleToNative(xwMini)) * 2 + i + y and 1 - ScaleToNative(hw) +
             ScaleToNative(G.lx) * 5) mod (ScaleToNative(G.lx) * 2);
@@ -4124 +4121 @@
               PrevMiniPixel.Pixel^.G := cm shr 8 and $FF;
               PrevMiniPixel.Pixel^.R := cm and $FF;
-            end
+            end;
           end
           else if (i = 0) and (MyMap[Loc] and fUnit <> 0) then
@@ -4157 +4154 @@
         end;
       end;
+    end;
   end;
   Mini.EndUpdate;
@@ -4351 +4349 @@
   Prio: boolean;
 begin
+  if not Assigned(MyRO) then Exit;
   with Panel.Canvas do
   begin