Changeset 616 for trunk

Timestamp:

Sep 15, 2024, 12:50:58 PM (3 months ago)

Author:

chronos

Message:

• Fixed: Only allow to fill editor map with real terrain types.

File:

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

trunk/LocalPlayer/Term.pas

@@ -428 +428 @@
     procedure SetFullScreen(Active: Boolean);
     procedure PaintZoomedTile(Dst: TBitmap; X, Y, Loc: Integer);
+    procedure UpdateInterface;
   public
     UsedOffscreenWidth: Integer;
@@ -672 +673 @@
   FastScrolling = False; // causes problems with overlapping windows
 
-  nBrushTypes = 26;
-  BrushTypes: array [0 .. nBrushTypes - 1] of Cardinal = (fPrefStartPos,
+  BrushTypes: array[0..25] of Cardinal = (fPrefStartPos,
     fStartPos, fShore, fGrass, fTundra, fPrairie, fDesert, fSwamp, fForest,
     fHills, fMountains, fArctic, fDeadLands, fDeadLands or fCobalt,
@@ -1124 +1124 @@
     end;
   end;
+end;
+
+procedure TMainScreen.UpdateInterface;
+begin
+  mFillMap.Enabled := BrushType in [fShore, fGrass, fTundra, fPrairie, fDesert, fSwamp, fForest,
+    fHills, fMountains, fArctic];
 end;
 
@@ -2959 +2965 @@
         HelpDlg.Difficulty := 0;
         BrushType := fGrass;
+        UpdateInterface;
         BrushLoc := -1;
         Edited := False;
@@ -4860 +4867 @@
 
 var
-  I, uix, uixDefender, X, xSrc, ySrc, xSrcBase, ySrcBase, CostFactor, Count,
+  I, uix, uixDefender, X, CostFactor, Count,
     mixShow, xTreasurySection, xResearchSection, JobFocus, TrueMoney,
     TrueResearch: Integer;
+  Src, SrcBase: TPoint;
   Tile: Cardinal;
   S: string;
@@ -4950 +4958 @@
             8, 8, 121 + I * 9, 61);
 
-    if ClientMode = cEditMap then
-    begin
+    if ClientMode = cEditMap then begin
       for I := 0 to TrRow - 1 do
         trix[I] := -1;
       Count := 0;
-      for I := 0 to nBrushTypes - 1 do
+      for I := 0 to Length(BrushTypes) - 1 do
       begin // display terrain types
         if (Count >= TrRow * VerticalScrollBar.Position) and (Count < TrRow * (VerticalScrollBar.Position + 1))
-        then
-        begin
+        then begin
           trix[Count - TrRow * VerticalScrollBar.Position] := BrushTypes[I];
           X := (Count - TrRow * VerticalScrollBar.Position) * TrPitch;
-          xSrcBase := -1;
+          SrcBase.X := -1;
           case BrushTypes[I] of
-            0..8:
-              begin
-                xSrc := BrushTypes[I];
-                ySrc := 0;
-              end;
-            9..30:
-              begin
-                xSrcBase := 2;
-                ySrcBase := 2;
-                xSrc := 0;
-                ySrc := 2 * Integer(BrushTypes[I]) - 15
-              end;
-            fRiver:
-              begin
-                xSrc := 7;
-                ySrc := 14;
-              end;
-            fRoad:
-              begin
-                xSrc := 0;
-                ySrc := 9;
-              end;
-            fRR:
-              begin
-                xSrc := 0;
-                ySrc := 10;
-              end;
-            fCanal:
-              begin
-                xSrc := 0;
-                ySrc := 11;
-              end;
-            fPoll:
-              begin
-                xSrc := 6;
-                ySrc := 12;
-              end;
+            0..8: Src := Point(BrushTypes[I], 0);
+            9..30: begin
+              SrcBase := Point(2, 2);
+              Src := Point(0, 2 * Integer(BrushTypes[I]) - 15);
+            end;
+            fRiver: Src := Point(7, 14);
+            fRoad: Src := Point(0, 9);
+            fRR: Src := Point(0, 10);
+            fCanal: Src := Point(0, 11);
+            fPoll: Src := Point(6, 12);
             fDeadLands, fDeadLands or fCobalt, fDeadLands or fUranium,
               fDeadLands or fMercury:
               begin
-                xSrcBase := 6;
-                ySrcBase := 2;
-                xSrc := 8;
-                ySrc := 12 + BrushTypes[I] shr 25;
+                SrcBase := Point(6, 2);
+                Src := Point(8, 12 + BrushTypes[I] shr 25);
               end;
             tiIrrigation, tiFarm, tiMine, tiBase:
-              begin
-                xSrc := BrushTypes[I] shr 12 - 1;
-                ySrc := 12;
-              end;
-            tiFort:
-              begin
-                xSrc := 3;
-                ySrc := 12;
-                xSrcBase := 7;
-                ySrcBase := 12;
-              end;
-            fPrefStartPos:
-              begin
-                xSrc := 0;
-                ySrc := 1;
-              end;
-            fStartPos:
-              begin
-                xSrc := 0;
-                ySrc := 2;
-              end;
+              Src := Point(BrushTypes[I] shr 12 - 1, 12);
+            tiFort: begin
+              Src := Point(3, 12);
+              SrcBase := Point(7, 12);
+            end;
+            fPrefStartPos: Src := Point(0, 1);
+            fStartPos: Src := Point(0, 2);
           end;
           with MainMap do begin
-            if xSrcBase >= 0 then
+            if SrcBase.X >= 0 then
               Sprite(Panel, HGrTerrain, xTroop + 2 + X, yTroop + 9 - yyt, xxt * 2,
-                yyt * 3, 1 + xSrcBase * (xxt * 2 + 1),
-                1 + ySrcBase * (yyt * 3 + 1));
+                yyt * 3, 1 + SrcBase.X * (xxt * 2 + 1),
+                1 + SrcBase.Y * (yyt * 3 + 1));
             Sprite(Panel, HGrTerrain, xTroop + 2 + X, yTroop + 9 - yyt, xxt * 2,
-              yyt * 3, 1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
+              yyt * 3, 1 + Src.X * (xxt * 2 + 1), 1 + Src.Y * (yyt * 3 + 1));
             if BrushTypes[I] = BrushType then begin
               ScreenTools.Frame(Panel.Canvas, xTroop + 2 + X,
@@ -5049 +5012 @@
           end;
         end;
-        Inc(Count)
+        Inc(Count);
       end;
       case BrushType of
@@ -5080 +5043 @@
         begin
           case BrushType of
-            fRoad:
-              I := 1;
-            fRR:
-              I := 2;
-            tiIrrigation:
-              I := 4;
-            tiFarm:
-              I := 5;
-            tiMine:
-              I := 7;
-            fCanal:
-              I := 8;
-            tiFort:
-              I := 10;
-            tiBase:
-              I := 12;
+            fRoad: I := 1;
+            fRR: I := 2;
+            tiIrrigation: I := 4;
+            tiFarm: I := 5;
+            tiMine: I := 7;
+            fCanal: I := 8;
+            tiFort: I := 10;
+            tiBase: I := 12;
           end;
           S := Phrases.Lookup('JOBRESULT', I);
-        end
+        end;
       end;
       LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 1,
@@ -6795 +6750 @@
         StatPopup.Popup(Left + ClientWidth - xPalace + 6,
           Top + ClientHeight - PanelHeight + yPalace + ySizeBig +
-          GetSystemMetrics(SM_CYCAPTION) + 3)
+          GetSystemMetrics(SM_CYCAPTION) + 3);
     end
-    (* else if (X>=xAdvisor-3) and (Y>=yAdvisor-3)
-      and (X<xAdvisor+16+3) and (Y<yAdvisor+16+3) and HaveStrategyAdvice then
+    (* else if (X >= xAdvisor - 3) and (Y >= yAdvisor - 3)
+      and (X < xAdvisor + 16 + 3) and (Y < yAdvisor + 16 + 3) and HaveStrategyAdvice then
       AdviceBtnClick *)
     else if (X >= xTroop + 1) and (Y >= yTroop + 1) and
@@ -6808 +6763 @@
         begin
           BrushType := trix[I];
+          UpdateInterface;
           PanelPaint;
         end
@@ -6829 +6785 @@
                 SetUnFocus(trix[I]);
                 SetTroopLoc(MyUn[trix[I]].Loc);
-                FocusOnLoc(TroopLoc, flRepaintPanel)
+                FocusOnLoc(TroopLoc, flRepaintPanel);
               end
               else
@@ -6836 +6792 @@
                   CityDlg.RestoreUnFocus := trix[I];
                 PanelPaint;
-              end
+              end;
             end
             else if (ClientMode < scContact) then
@@ -6893 +6849 @@
   trixFocus := -1;
   if ClientMode = cEditMap then
-    TrCnt := nBrushTypes
+    TrCnt := Length(BrushTypes)
   else if (Loc >= 0) and (MyMap[Loc] and fUnit <> 0) then
     if MyMap[Loc] and fOwned <> 0 then
@@ -7893 +7849 @@
       MapBoxMouseDown(nil, TMouseButton.mbLeft, Shift, X, Y);
   end
-  (* else if Idle and (UnFocus>=0) then
+  (* else if Idle and (UnFocus >= 0) then
     begin
-    qx:=(xMouse*32+yMouse*66+16*66) div(32*66)-1;
-    qy:=(yMouse*66-xMouse*32-16*66+2000*33*32) div(32*66)-999;
-    MouseLoc:=(xw+(qx-qy+2048) div 2-1024+G.lx) mod G.lx+G.lx*(yw+qx+qy);
+    qx := (xMouse * 32 + yMouse * 66 + 16 * 66) div(32 * 66) - 1;
+    qy := (yMouse * 66 - xMouse * 32 - 16 * 66 + 2000 * 33 * 32) div(32 * 66) - 999;
+    MouseLoc := (xw + (qx - qy + 2048) div 2 - 1024 + G.lx) mod G.lx + G.lx * (yw + qx + qy);
     ShowMoveHint(MouseLoc);
     end *)
@@ -7953 +7909 @@
     else if (Y >= TopBarHeight) and (X >= MapOffset) and
       (X < MapOffset + MapWidth) then
-      MapBoxMouseDown(Sender, Button, Shift, X - MapOffset, Y - TopBarHeight)
+      MapBoxMouseDown(Sender, Button, Shift, X - MapOffset, Y - TopBarHeight);
 end;