Changeset 261 for trunk

Timestamp:

Jun 11, 2020, 12:40:26 AM (4 years ago)

Author:

chronos

Message:

• Added: Partial support for key bindings configuration.

Location:

trunk

Files:

• Integrated.lpi (modified) (2 diffs)
• LocalPlayer/Help.pas (modified) (2 diffs)
• LocalPlayer/Term.pas (modified) (4 diffs)
• Start.pas (modified) (5 diffs)

trunk/Integrated.lpi

@@ -95 +95 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="41">
+    <Units Count="42">
       <Unit0>
         <Filename Value="Integrated.lpr"/>
@@ -332 +332 @@
         <IsPartOfProject Value="True"/>
       </Unit40>
+      <Unit41>
+        <Filename Value="UKeyBindings.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit41>
     </Units>
   </ProjectOptions>

trunk/LocalPlayer/Help.pas

@@ -127 +127 @@
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global,
+  UKeyBindings;
 
 {$R *.lfm}
@@ -2010 +2011 @@
   Shift: TShiftState);
 begin
-  if Key = VK_F1 then // my key
+  if KeyToShortCut(Key, Shift) = BHelp.ShortCut then // my key
   else
-    inherited
+    inherited;
 end;
 

trunk/LocalPlayer/Term.pas

@@ -481 +481 @@
   Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
   UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
-  Battle, Rates, TechTree, Registry, Global;
+  Battle, Rates, TechTree, Registry, Global, UKeyBindings;
 
 {$R *.lfm}
@@ -6453 +6453 @@
   dx, dy: integer;
   time0, time1: TDateTime;
-begin
+  ShortCut: TShortCut;
+begin
+  ShortCut := KeyToShortCut(Key, Shift);
+
   if GameMode = cMovie then
   begin
@@ -6493 +6496 @@
         'R':
           MenuClick(mRandomMap);
-      end
-    else if Shift = [] then
-      case char(Key) of
-        char(VK_F1):
-          MenuClick(mHelp);
       end;
-    exit;
-  end;
+    if ShortCut = BHelp.ShortCut then MenuClick(mHelp);
+    Exit;
+  end;
+
+  if ShortCut = BEndTurn.ShortCut then EndTurn
+  else if ShortCut = BHelp.ShortCut then MenuClick(mHelp)
+  else if ShortCut = BUnitStat.ShortCut then MenuClick_Check(StatPopup, mUnitStat)
+  else if ShortCut = BCityStat.ShortCut then MenuClick_Check(StatPopup, mCityStat)
+  else if ShortCut = BScienceStat.ShortCut then MenuClick_Check(StatPopup, mScienceStat)
+  else if ShortCut = BEUnitStat.ShortCut then MenuClick_Check(StatPopup, mEUnitStat)
+  else if ShortCut = BDiagram.ShortCut then MenuClick_Check(StatPopup, mDiagram)
+  else if ShortCut = BWonders.ShortCut then MenuClick_Check(StatPopup, mWonders)
+  else if ShortCut = BShips.ShortCut then MenuClick_Check(StatPopup, mShips)
+  else if ShortCut = BNations.ShortCut then MenuClick_Check(StatPopup, mNations)
+  else if ShortCut = BEmpire.ShortCut then MenuClick_Check(StatPopup, mEmpire);
 
   if Shift = [ssAlt] then
@@ -6547 +6558 @@
   else if Shift = [] then
     case char(Key) of
-      char(VK_F1):
-        MenuClick(mHelp);
-      char(VK_F2):
-        MenuClick_Check(StatPopup, mUnitStat);
-      char(VK_F3):
-        MenuClick_Check(StatPopup, mCityStat);
-      char(VK_F4):
-        MenuClick_Check(StatPopup, mScienceStat);
-      char(VK_F5):
-        MenuClick_Check(StatPopup, mEUnitStat);
-      char(VK_F6):
-        MenuClick_Check(StatPopup, mDiagram);
-      char(VK_F7):
-        MenuClick_Check(StatPopup, mWonders);
-      char(VK_F8):
-        MenuClick_Check(StatPopup, mShips);
-      char(VK_F9):
-        MenuClick_Check(StatPopup, mNations);
-      char(VK_F10):
-        MenuClick_Check(StatPopup, mEmpire);
-      char(VK_ADD):
-        EndTurn;
       '1':
         MapBtnClick(MapBtn0);

trunk/Start.pas

@@ -165 +165 @@
 
 uses
-  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UPixelPointer;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UPixelPointer,
+  UKeyBindings;
 
 {$R *.lfm}
@@ -224 +225 @@
   PlayerAutoDiff: array [1 .. 5] of integer = (1, 1, 2, 2, 3);
   EnemyAutoDiff: array [1 .. 5] of integer = (4, 3, 2, 1, 1);
+  KeyBindingsFileName = 'KeyBindings.txt';
 
 { TMiniMap }
@@ -435 +437 @@
   PlayerSlot: TPlayerSlot;
   AIBrains: TBrains;
+  KeyBindingsAbsoluteFileName: string;
 begin
   PlayerSlots := TPlayerSlots.Create;
@@ -445 +448 @@
   LoadConfig;
   LoadAssets;
+  KeyBindingsAbsoluteFileName := DataDir + DirectorySeparator + KeyBindingsFileName;
+  if FileExists(KeyBindingsAbsoluteFileName) then KeyBindings.LoadFromFile(KeyBindingsAbsoluteFileName)
+    else begin
+      ForceDirectories(ExtractFileDir(KeyBindingsAbsoluteFileName));
+      KeyBindings.SaveToFile(KeyBindingsAbsoluteFileName);
+    end;
 
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
@@ -1963 +1972 @@
   Shift: TShiftState);
 begin
-  if (Shift = []) and (Key = VK_F1) then
+  if KeyToShortCut(Key, Shift) = BHelp.ShortCut then
     DirectHelp(cStartHelp);
 end;