Changeset 288 for trunk/LocalPlayer

Timestamp:

Feb 26, 2021, 9:43:24 PM (4 years ago)

Author:

chronos

Message:

• Added: Supported more key bindings.
• Fixed: Wrong default binding for NoOrder (space key).
• Modified: Pushed trunk version to 1.3.0.
• Modified: Update readme.txt with information for development.

Location:

trunk/LocalPlayer

Files:

• TechTree.pas (modified) (1 diff)
• Term.lfm (modified) (9 diffs)
• Term.pas (modified) (9 diffs)

trunk/LocalPlayer/TechTree.pas

@@ -132 +132 @@
   NewHeight: Integer;
 const
-  TransparentColor = $7F007F;
+  TransparentColor: Cardinal = $7F007F;
 begin
   if Image = nil then begin

trunk/LocalPlayer/Term.lfm

@@ -1 +1 @@
 object MainScreen: TMainScreen
-  Left = 231
+  Left = 169
   Height = 480
-  Top = 190
+  Top = 596
   Width = 800
   HorzScrollBar.Visible = False
@@ -12 +12 @@
   Constraints.MinHeight = 480
   Constraints.MinWidth = 800
+  DesignTimePPI = 144
   Font.Color = clWindowText
   Font.Height = -13
@@ -30 +31 @@
   OnShow = FormShow
   Position = poDefault
-  PixelsPerInch = 96
+  LCLVersion = '2.0.12.0'
   Scaled = False
-  LCLVersion = '1.6.0.4'
   WindowState = wsMaximized
   object UnitBtn: TButtonB
@@ -217 +217 @@
     Interval = 50
     OnTimer = Timer1Timer
-    left = 8
-    top = 48
+    Left = 8
+    Top = 48
   end
   object GamePopup: TPopupMenu
     AutoPopup = False
-    left = 40
-    top = 48
+    Left = 40
+    Top = 48
     object mHelp: TMenuItem
       Tag = 7
@@ -459 +459 @@
           RadioItem = True
           OnClick = mBigTilesClick
-        end             
+        end
       end
       object mSound: TMenuItem
@@ -587 +587 @@
   object UnitPopup: TPopupMenu
     AutoPopup = False
-    left = 104
-    top = 48
+    Left = 104
+    Top = 48
     object mdisband: TMenuItem
       Tag = 72
@@ -670 +670 @@
   object StatPopup: TPopupMenu
     AutoPopup = False
-    left = 72
-    top = 48
+    Left = 72
+    Top = 48
     object mUnitStat: TMenuItem
       Tag = 9
@@ -726 +726 @@
   end
   object EditPopup: TPopupMenu
-    left = 168
-    top = 48
+    Left = 168
+    Top = 48
     object mCreateUnit: TMenuItem
       Tag = 47
@@ -733 +733 @@
   end
   object TerrainPopup: TPopupMenu
-    left = 136
-    top = 48
+    Left = 136
+    Top = 48
     object mtrans: TMenuItem
       Tag = 273

trunk/LocalPlayer/Term.pas

@@ -283 +283 @@
     procedure OnEOT(var Msg: TMessage); message WM_EOT;
     procedure SoundPreload(Check: integer);
+    procedure UpdateKeyShortcuts;
   public
     UsedOffscreenWidth, UsedOffscreenHeight: integer;
@@ -3404 +3405 @@
   i, j: integer;
 begin
+  UpdateKeyShortcuts;
+
   MainFormKeyDown := FormKeyDown;
   BaseWin.CreateOffscreen(Offscreen);
@@ -3617 +3620 @@
   CanClose := Closable;
   if not Closable and idle and (me = 0) and (ClientMode < scContact) then
-    MenuClick(mResign)
+    MenuClick(mResign);
 end;
 
@@ -3630 +3633 @@
 procedure TMainScreen.OnEOT(var Msg: TMessage);
 begin
-  EndTurn
+  EndTurn;
 end;
 
@@ -3638 +3641 @@
   begin
     MessgExDlg.CancelMovie;
-    Server(sBreak, me, 0, nil^)
+    Server(sBreak, me, 0, nil^);
   end
   else if ClientMode < 0 then
@@ -3647 +3650 @@
   begin
     Jump[pTurn] := 0;
-    StartRunning := false
+    StartRunning := false;
   end
   else
-    EndTurn
+    EndTurn;
 end;
 
@@ -6440 +6443 @@
 end;
 
+procedure TMainScreen.UpdateKeyShortcuts;
+begin
+  mHelp.ShortCut := BHelp.ShortCut;
+  mUnitStat.ShortCut := BUnitStat.ShortCut;
+  mCityStat.ShortCut := BCityStat.ShortCut;
+  mScienceStat.ShortCut := BScienceStat.ShortCut;
+  mEUnitStat.ShortCut := BEUnitStat.ShortCut;;
+  mDiagram.ShortCut := BDiagram.ShortCut;
+  mWonders.ShortCut := BWonders.ShortCut;
+  mShips.ShortCut := BShips.ShortCut;
+  mNations.ShortCut := BNations.ShortCut;
+  mEmpire.ShortCut := BEmpire.ShortCut;
+  mResign.ShortCut := BResign.ShortCut;
+  mRandomMap.ShortCut := BRandomMap.ShortCut;
+  mDisband.ShortCut := BDisbandUnit.ShortCut;
+  mFort.ShortCut := BFortify.ShortCut;
+  mCentre.ShortCut := BCenterUnit.ShortCut;
+  mStay.ShortCut := BStay.ShortCut;
+  mNoOrders.ShortCut := BNoOrders.ShortCut;
+  mTechTree.ShortCut := BTechTree.ShortCut;
+  mWait.ShortCut := BWait.ShortCut;
+  mJump.ShortCut := BJump.ShortCut;;
+end;
+
 procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: word;
   Shift: TShiftState);
@@ -6513 +6540 @@
     end
   end else if Shift = [ssCtrl] then begin
+    if ShortCut = BJump.ShortCut then MenuClick(mJump);
     case char(Key) of
-      'J': MenuClick(mJump);
       'K': mShowClick(mDebugMap);
       'L': mShowClick(mLocCodes);
@@ -6542 +6569 @@
       '4': MapBtnClick(MapBtn5);
       '5': MapBtnClick(MapBtn6);
-      'T': MenuClick(mTechTree);
-      'W': MenuClick(mWait);
     end;
+    if ShortCut = BTechTree.ShortCut then MenuClick(mTechTree)
+    else if ShortCut = BWait.ShortCut then MenuClick(mWait);
   end;