Changeset 704

Timestamp:

Aug 12, 2025, 3:14:50 PM (21 hours ago)

Author:

chronos

Message:

• Fixed: Enable map move keys also in editor mode.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (2 diffs)
• MiniMap.pas (modified) (4 diffs)

trunk/LocalPlayer/Term.pas

@@ -7160 +7160 @@
   if not Idle then Exit;
 
+  // Map move
+  if BMapMoveLeftDown.Test(ShortCut) then DoMoveMap(-1, 1)
+  else if BMapMoveDown.Test(ShortCut) then DoMoveMap(0, 2)
+  else if BMapMoveRightDown.Test(ShortCut) then DoMoveMap(1, 1)
+  else if BMapMoveLeft.Test(ShortCut) then DoMoveMap(-2, 0)
+  else if BMapMoveRight.Test(ShortCut) then DoMoveMap(2, 0)
+  else if BMapMoveLeftUp.Test(ShortCut) then DoMoveMap(-1, -1)
+  else if BMapMoveUp.Test(ShortCut) then DoMoveMap(0, -2)
+  else if BMapMoveRightUp.Test(ShortCut) then DoMoveMap(1, -1);
+
   if ClientMode = cEditMap then begin
     if BResign.Test(ShortCut) then mResign.Click
@@ -7278 +7288 @@
     else if BUnitMoveLeftUp.Test(ShortCut) then DoMoveUnit(-1, -1)
     else if BUnitMoveUp.Test(ShortCut) then  DoMoveUnit(0, -2)
-    else if BUnitMoveRightUp.Test(ShortCut) then DoMoveUnit(1, -1)
-    // Map move
-    else if BMapMoveLeftDown.Test(ShortCut) then DoMoveMap(-1, 1)
-    else if BMapMoveDown.Test(ShortCut) then DoMoveMap(0, 2)
-    else if BMapMoveRightDown.Test(ShortCut) then DoMoveMap(1, 1)
-    else if BMapMoveLeft.Test(ShortCut) then DoMoveMap(-2, 0)
-    else if BMapMoveRight.Test(ShortCut) then DoMoveMap(2, 0)
-    else if BMapMoveLeftUp.Test(ShortCut) then DoMoveMap(-1, -1)
-    else if BMapMoveUp.Test(ShortCut) then DoMoveMap(0, -2)
-    else if BMapMoveRightUp.Test(ShortCut) then DoMoveMap(1, -1);
+    else if BUnitMoveRightUp.Test(ShortCut) then DoMoveUnit(1, -1);
   end;
 end;

trunk/MiniMap.pas

@@ -313 +313 @@
   xxt, xwMini: Integer);
 var
-  x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
+  X, Y, Loc, I, HW, XM, CM, cmPolOcean, cmPolNone: integer;
   PrevMiniPixel: TPixelPointer;
   MiniPixel: TPixelPointer;
@@ -321 +321 @@
   MyUnit: PUn;
   EnemyUnit: PUnitInfo;
-  xx, yy: Integer;
+  XX, YY: Integer;
 begin
   if not Assigned(MyMap) then Exit;
   cmPolOcean := HGrSystem.Data.Canvas.Pixels[101, 67];
   cmPolNone := HGrSystem.Data.Canvas.Pixels[102, 67];
-  hw := MapWidth div (xxt * 2);
+  HW := MapWidth div (xxt * 2);
   with Bitmap.Canvas do begin
     Brush.Color := $000000;
@@ -337 +337 @@
   PrevMiniPixel := TPixelPointer.Create(Bitmap);
 
-  xx := ScaleToNative(Size.X);
-  yy := ScaleToNative(Size.Y);
-  for y := 0 to yy - 1 do begin
-    for x := 0 to xx - 1 do begin
-      Loc := ScaleFromNative(x) + Size.X * ScaleFromNative(y);
+  XX := ScaleToNative(Size.X);
+  YY := ScaleToNative(Size.Y);
+  for Y := 0 to YY - 1 do begin
+    for X := 0 to XX - 1 do begin
+      Loc := ScaleFromNative(X) + Size.X * 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) +
-            xx * 5) mod (xx * 2);
-          MiniPixel.SetX(xm);
+        for I := 0 to 1 do begin
+          XM := ((X - ScaleToNative(xwMini)) * 2 + I + Y and 1 - ScaleToNative(HW) +
+            XX * 5) mod (XX * 2);
+          MiniPixel.SetX(XM);
           TerrainTile := MyMap[Loc] and fTerrain;
           if TerrainTile > 11 then TerrainTile := 0;
-          cm := Colors[TerrainTile, i];
+          CM := Colors[TerrainTile, I];
           if ClientMode = cEditMap then begin
             if MyMap[Loc] and (fPrefStartPos or fStartPos) <> 0 then
-              cm := $FFFFFF;
+              CM := $FFFFFF;
           end
           else if MyMap[Loc] and fCity <> 0 then begin
             // City
             MyCity := GetMyCityByLoc(Loc);
-            if Assigned(MyCity) then cm := Tribe[me].Color
+            if Assigned(MyCity) then CM := Tribe[me].Color
             else begin
               EnemyCity := GetEnemyCityByLoc(Loc);
               if Assigned(EnemyCity) then
-                cm := Tribe[EnemyCity^.Owner].Color;
+                CM := Tribe[EnemyCity^.Owner].Color;
             end;
-            cm := $808080 or cm shr 1; { increase brightness }
-            if y > 0 then begin
+            CM := $808080 or CM shr 1; { increase brightness }
+            if Y > 0 then begin
               // 2x2 city dot covers two lines
-              PrevMiniPixel.SetX(xm);
+              PrevMiniPixel.SetX(XM);
               if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * PrevMiniPixel.BytesPerLine)) then begin
-                PrevMiniPixel.PixelB := (cm shr 16) and $ff;
-                PrevMiniPixel.PixelG := (cm shr 8) and $ff;
-                PrevMiniPixel.PixelR := (cm shr 0) and $ff;
+              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * PrevMiniPixel.BytesPerLine)) then begin
+                PrevMiniPixel.PixelB := (CM shr 16) and $ff;
+                PrevMiniPixel.PixelG := (CM shr 8) and $ff;
+                PrevMiniPixel.PixelR := (CM shr 0) and $ff;
               end;
             end;
           end
-          else if (i = 0) and (MyMap[Loc] and fUnit <> 0) then begin
+          else if (I = 0) and (MyMap[Loc] and fUnit <> 0) then begin
             // Unit
             MyUnit := GetMyUnitByLoc(Loc);
-            if Assigned(MyUnit) then cm := Tribe[me].Color
+            if Assigned(MyUnit) then CM := Tribe[me].Color
             else begin
               EnemyUnit := GetEnemyUnitByLoc(Loc);
               if Assigned(EnemyUnit) then
-                cm := Tribe[EnemyUnit.Owner].Color;
+                CM := Tribe[EnemyUnit.Owner].Color;
             end;
-            cm := $808080 or cm shr 1; { increase brightness }
+            CM := $808080 or CM shr 1; { increase brightness }
           end
           else if moPolitical in MapOptions then begin
             // Political
-            if MyMap[Loc] and fTerrain < fGrass then cm := cmPolOcean
-            else if MyRO.Territory[Loc] < 0 then cm := cmPolNone
-            else cm := Tribe[MyRO.Territory[Loc]].Color;
+            if MyMap[Loc] and fTerrain < fGrass then CM := cmPolOcean
+            else if MyRO.Territory[Loc] < 0 then CM := cmPolNone
+            else CM := Tribe[MyRO.Territory[Loc]].Color;
           end;
           if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
-            MiniPixel.PixelB := (cm shr 16) and $ff;
-            MiniPixel.PixelG := (cm shr 8) and $ff;
-            MiniPixel.PixelR := (cm shr 0) and $ff;
+          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine)) then begin
+            MiniPixel.PixelB := (CM shr 16) and $ff;
+            MiniPixel.PixelG := (CM shr 8) and $ff;
+            MiniPixel.PixelR := (CM shr 0) and $ff;
           end;
         end;
@@ -402 +402 @@
     end;
     MiniPixel.NextLine;
-    if y > 0 then PrevMiniPixel.NextLine;
+    if Y > 0 then PrevMiniPixel.NextLine;
   end;
   Bitmap.EndUpdate;