Changeset 615 for trunk

Timestamp:

Sep 14, 2024, 6:20:50 PM (3 months ago)

Author:

chronos

Message:

• Added: Allow to scroll map with Ctrl+arrows/num keys.

Location:

trunk/LocalPlayer

Files:

• KeyBindings.pas (modified) (3 diffs)
• Term.pas (modified) (6 diffs)

trunk/LocalPlayer/KeyBindings.pas

@@ -117 +117 @@
   BRecover: TKeyBinding;
   BUtilize: TKeyBinding;
-  BMoveLeftDown: TKeyBinding;
-  BMoveDown: TKeyBinding;
-  BMoveRightDown: TKeyBinding;
-  BMoveRight: TKeyBinding;
-  BMoveRightUp: TKeyBinding;
-  BMoveUp: TKeyBinding;
-  BMoveLeftUp: TKeyBinding;
-  BMoveLeft: TKeyBinding;
+  BUnitMoveLeftDown: TKeyBinding;
+  BUnitMoveDown: TKeyBinding;
+  BUnitMoveRightDown: TKeyBinding;
+  BUnitMoveRight: TKeyBinding;
+  BUnitMoveRightUp: TKeyBinding;
+  BUnitMoveUp: TKeyBinding;
+  BUnitMoveLeftUp: TKeyBinding;
+  BUnitMoveLeft: TKeyBinding;
+  BMapMoveLeftDown: TKeyBinding;
+  BMapMoveDown: TKeyBinding;
+  BMapMoveRightDown: TKeyBinding;
+  BMapMoveRight: TKeyBinding;
+  BMapMoveRightUp: TKeyBinding;
+  BMapMoveUp: TKeyBinding;
+  BMapMoveLeftUp: TKeyBinding;
+  BMapMoveLeft: TKeyBinding;
 
 
@@ -382 +390 @@
   BRecover := AddItem('Recover', 'Recover', 'V');
   BUtilize := AddItem('Utilize', 'Utilize', 'Z');
-  BMoveLeftDown := AddItem('MoveLeftDown', 'Move unit left-down', 'Num1', 'End');
-  BMoveDown := AddItem('MoveDown', 'Move unit down', 'Num2', 'Down');
-  BMoveRightDown := AddItem('MoveRightDown', 'Move unit right-down', 'Num3', 'PgDn');
-  BMoveRight := AddItem('MoveRight', 'Move unit right', 'Num6', 'Right');
-  BMoveRightUp := AddItem('MoveRightUp', 'Move unit right-up', 'Num9', 'PgUp');
-  BMoveUp := AddItem('MoveUp', 'Move unit up', 'Num8', 'Up');
-  BMoveLeftUp := AddItem('MoveLeftUp', 'Move unit left-up', 'Num7', 'Home');
-  BMoveLeft := AddItem('MoveLeft', 'Move unit left', 'Num4', 'Left');
+  // Unit moves
+  BUnitMoveLeftDown := AddItem('MoveLeftDown', 'Move unit left-down', 'Num1', 'End');
+  BUnitMoveDown := AddItem('MoveDown', 'Move unit down', 'Num2', 'Down');
+  BUnitMoveRightDown := AddItem('MoveRightDown', 'Move unit right-down', 'Num3', 'PgDn');
+  BUnitMoveRight := AddItem('MoveRight', 'Move unit right', 'Num6', 'Right');
+  BUnitMoveRightUp := AddItem('MoveRightUp', 'Move unit right-up', 'Num9', 'PgUp');
+  BUnitMoveUp := AddItem('MoveUp', 'Move unit up', 'Num8', 'Up');
+  BUnitMoveLeftUp := AddItem('MoveLeftUp', 'Move unit left-up', 'Num7', 'Home');
+  BUnitMoveLeft := AddItem('MoveLeft', 'Move unit left', 'Num4', 'Left');
+  // Map moves
+  BMapMoveLeftDown := AddItem('MapMoveLeftDown', 'Move map left-down', 'Ctrl+Num1', 'Ctrl+End');
+  BMapMoveDown := AddItem('MapMoveDown', 'Move map down', 'Ctrl+Num2', 'Ctrl+Down');
+  BMapMoveRightDown := AddItem('MapMoveRightDown', 'Move map right-down', 'Ctrl+Num3', 'Ctrl+PgDn');
+  BMapMoveRight := AddItem('MapMoveRight', 'Move map right', 'Ctrl+Num6', 'Ctrl+Right');
+  BMapMoveRightUp := AddItem('MapMoveRightUp', 'Move map right-up', 'Ctrl+Num9', 'Ctrl+PgUp');
+  BMapMoveUp := AddItem('MapMoveUp', 'Move map up', 'Ctrl+Num8', 'Ctrl+Up');
+  BMapMoveLeftUp := AddItem('MapMoveLeftUp', 'Move map left-up', 'Ctrl+Num7', 'Ctrl+Home');
+  BMapMoveLeft := AddItem('MapMoveLeft', 'Move map left', 'Ctrl+Num4', 'Ctrl+Left');
+
   SortAlpha;
 end;
@@ -400 +419 @@
 end.
 
-

trunk/LocalPlayer/Term.pas

@@ -13 +13 @@
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
   LCLIntf, LCLType, Menus, SysUtils, Classes, DrawDlg, Types, Math,
-  DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area,
+  DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area, Help,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
   Diagram, CityScreen, Rates, Battle, NatStat, UnitStat, Draft, Select, MessgEx,
-  Help,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Menus, Dpi.ExtCtrls,
   Dpi.PixelPointer, Dpi.Common, System.UITypes{$ELSE}
@@ -244 +243 @@
       Shift: TShiftState; X, Y: Integer);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure mDisbandOrUtilizeClick(Sender: TObject);
     procedure FormResize(Sender: TObject);
@@ -270 +270 @@
     procedure mNamesClick(Sender: TObject);
     procedure MapBtnClick(Sender: TObject);
-    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure CreateUnitClick(Sender: TObject);
     procedure mSoundOffClick(Sender: TObject);
@@ -7120 +7119 @@
   end;
 
+  procedure DoMoveMap(X, Y: Integer);
+  var
+    ScrollSpeed: Integer;
+  begin
+    if mScrollFast.Checked then ScrollSpeed := 2
+      else ScrollSpeed := 1;
+    if (X <> 0) or (Y <> 0) then begin
+      Scroll(X * ScrollSpeed, Y * ScrollSpeed);
+    end;
+  end;
+
 var
   Time0, Time1: TDateTime;
@@ -7241 +7251 @@
       InitPopup(TerrainPopup);
       if mEnhance.Visible and mEnhance.Enabled then mEnhance.Click
-        else mEnhanceDef.Click
+        else mEnhanceDef.Click;
     end
     else if BGoOn.Test(ShortCut) then MenuClick_Check(UnitPopup, mGoOn)
@@ -7267 +7277 @@
     else if BRecover.Test(ShortCut) then MenuClick_Check(UnitPopup, mRecover)
     else if BUtilize.Test(ShortCut) then MenuClick_Check(UnitPopup, mUtilize)
-    else if BMoveLeftDown.Test(ShortCut) then DoMoveUnit(-1, 1)
-    else if BMoveDown.Test(ShortCut) then DoMoveUnit(0, 2)
-    else if BMoveRightDown.Test(ShortCut) then DoMoveUnit(1, 1)
-    else if BMoveLeft.Test(ShortCut) then DoMoveUnit(-2, 0)
-    else if BMoveRight.Test(ShortCut) then DoMoveUnit(2, 0)
-    else if BMoveLeftUp.Test(ShortCut) then DoMoveUnit(-1, -1)
-    else if BMoveUp.Test(ShortCut) then  DoMoveUnit(0, -2)
-    else if BMoveRightUp.Test(ShortCut) then DoMoveUnit(1, -1);
+    // Unit move
+    else if BUnitMoveLeftDown.Test(ShortCut) then DoMoveUnit(-1, 1)
+    else if BUnitMoveDown.Test(ShortCut) then DoMoveUnit(0, 2)
+    else if BUnitMoveRightDown.Test(ShortCut) then DoMoveUnit(1, 1)
+    else if BUnitMoveLeft.Test(ShortCut) then DoMoveUnit(-2, 0)
+    else if BUnitMoveRight.Test(ShortCut) then DoMoveUnit(2, 0)
+    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);
   end;
 end;