Changeset 405 for branches/highdpi/LocalPlayer/Term.pas

Timestamp:

Nov 3, 2021, 11:22:02 AM (2 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r404.

File:

• branches/highdpi/LocalPlayer/Term.pas (modified) (23 diffs)

branches/highdpi/LocalPlayer/Term.pas

@@ -29 +29 @@
   TMainScreen = class(TDrawDlg)
     mBigTiles: TDpiMenuItem;
+    mNextUnit: TDpiMenuItem;
+    N13: TDpiMenuItem;
+    mPrevUnit: TDpiMenuItem;
     Timer1: TTimer;
     GamePopup: TDpiPopupMenu;
@@ -286 +289 @@
     procedure CopyMiniToPanel;
     procedure PanelPaint;
-    procedure NextUnit(NearLoc: integer; AutoTurn: boolean);
+    procedure FocusNextUnit(Dir: Integer = 1);
+    procedure NextUnit(NearLoc: Integer; AutoTurn: Boolean);
     procedure Scroll(dx, dy: integer);
     procedure SetMapPos(Loc: integer; MapPos: TPoint);
@@ -2433 +2437 @@
   begin
     SetTroopLoc(-1);
-    PaintAll
+    PaintAll;
   end { supervisor }
   { else if (ClientMode=cTurn) and (MyRO.Turn=0) then
@@ -2455 +2459 @@
           FocusOnLoc(G.lx * G.ly div 2);
       SetTroopLoc(-1);
-      PanelPaint
+      PanelPaint;
     end;
     if ShowCityList then
@@ -3446 +3450 @@
   NoMapPanel := TIsoMap.Create;
 
-  KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   UpdateKeyShortcuts;
 
@@ -3545 +3548 @@
   I: Integer;
 begin
-  KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   MainFormKeyDown := nil;
   FreeAndNil(sb);
@@ -4904 +4906 @@
 end;
 
+procedure TMainScreen.FocusNextUnit(Dir: Integer);
+var
+  i, uix, NewFocus: Integer;
+begin
+  if ClientMode >= scContact then
+    Exit;
+  DestinationMarkON := False;
+  PaintDestination;
+  NewFocus := -1;
+  for i := 1 to MyRO.nUn do begin
+    uix := (UnFocus + i * Dir + MyRO.nUn) mod MyRO.nUn;
+    if (MyUn[uix].Loc >= 0) and (MyUn[uix].Status and usStay = 0) then begin
+      NewFocus := uix;
+      Break;
+    end;
+  end;
+  if NewFocus >= 0 then begin
+    SetUnFocus(NewFocus);
+    SetTroopLoc(MyUn[NewFocus].Loc);
+    FocusOnLoc(TroopLoc, flRepaintPanel);
+  end;
+end;
+
 procedure TMainScreen.FocusOnLoc(Loc: integer; Options: integer = 0);
 var
@@ -4930 +4955 @@
 end;
 
-procedure TMainScreen.NextUnit(NearLoc: integer; AutoTurn: boolean);
+procedure TMainScreen.NextUnit(NearLoc: Integer; AutoTurn: Boolean);
 var
-  Dist, TestDist: single;
-  i, uix, NewFocus: integer;
-  GotoOnly: boolean;
+  Dist, TestDist: Single;
+  i, uix, NewFocus: Integer;
+  GotoOnly: Boolean;
 begin
   Dist := 0;
   if ClientMode >= scContact then
-    exit;
-  DestinationMarkON := false;
+    Exit;
+  DestinationMarkON := False;
   PaintDestination;
-  for GotoOnly := GoOnPhase downto false do
-  begin
+  for GotoOnly := GoOnPhase downto False do begin
     NewFocus := -1;
-    for i := 1 to MyRO.nUn do
-    begin
+    for i := 1 to MyRO.nUn do begin
       uix := (UnFocus + i) mod MyRO.nUn;
       if (MyUn[uix].Loc >= 0) and (MyUn[uix].Job = jNone) and
         (MyUn[uix].Status and (usStay or usRecover or usWaiting) = usWaiting)
         and (not GotoOnly or (MyUn[uix].Status and usGoto <> 0)) then
-        if NearLoc < 0 then
-        begin
+        if NearLoc < 0 then begin
           NewFocus := uix;
           Break;
-        end
-        else
-        begin
+        end else begin
           TestDist := Distance(NearLoc, MyUn[uix].Loc);
-          if (NewFocus < 0) or (TestDist < Dist) then
-          begin
+          if (NewFocus < 0) or (TestDist < Dist) then begin
             NewFocus := uix;
             Dist := TestDist;
@@ -4966 +4985 @@
     end;
     if GotoOnly then
-      if NewFocus < 0 then
-        GoOnPhase := false
-      else
-        Break;
-  end;
-  if NewFocus >= 0 then
-  begin
+      if NewFocus < 0 then GoOnPhase := False
+        else Break;
+  end;
+  if NewFocus >= 0 then begin
     SetUnFocus(NewFocus);
     SetTroopLoc(MyUn[NewFocus].Loc);
-    FocusOnLoc(TroopLoc, flRepaintPanel)
-  end
-  else if AutoTurn and not mWaitTurn.Checked then
-  begin
-    TurnComplete := true;
+    FocusOnLoc(TroopLoc, flRepaintPanel);
+  end else
+  if AutoTurn and not mWaitTurn.Checked then begin
+    TurnComplete := True;
     SetUnFocus(-1);
     SetTroopLoc(-1);
-    PostMessage(Handle, WM_EOT, 0, 0)
-  end
-  else
-  begin
+    PostMessage(Handle, WM_EOT, 0, 0);
+  end else begin
     if { (UnFocus>=0) and } not TurnComplete and EOT.Visible then
       Play('TURNEND');
-    TurnComplete := true;
+    TurnComplete := True;
     SetUnFocus(-1);
     SetTroopLoc(-1);
@@ -5962 +5975 @@
         end
         else
-          NextUnit(UnStartLoc, true)
+          NextUnit(UnStartLoc, true);
     end
     else if (UnFocus < 0) and (Options and muAutoNext <> 0) then
@@ -6167 +6180 @@
         begin
           MyUn[uix].Status := MyUn[uix].Status and not usWaiting;
-          NextUnit(UnStartLoc, true)
+          NextUnit(UnStartLoc, true);
         end;
       end;
@@ -6328 +6341 @@
               trixFocus := TrCnt;
             inc(TrCnt);
-          end
+          end;
     end
     else // count enemy units here
@@ -6443 +6456 @@
   mStay.ShortCut := BStay.ShortCut;
   mNoOrders.ShortCut := BNoOrders.ShortCut;
+  mPrevUnit.ShortCut := BPrevUnit.ShortCut;
+  mNextUnit.ShortCut := BNextUnit.ShortCut;
   mCancel.ShortCut := BCancel.ShortCut;
   mPillage.ShortCut := BPillage.ShortCut;
@@ -6636 +6651 @@
     else if BStay.Test(ShortCut) then MenuClick(mStay)
     else if BNoOrders.Test(ShortCut) then MenuClick(mNoOrders)
+    else if BPrevUnit.Test(ShortCut) then MenuClick(mPrevUnit)
+    else if BNextUnit.Test(ShortCut) then MenuClick(mNextUnit)
     else if BCancel.Test(ShortCut) then MenuClick_Check(UnitPopup, mCancel)
     else if BPillage.Test(ShortCut) then MenuClick_Check(UnitPopup, mPillage)
@@ -6718 +6735 @@
           end
           else
-            PanelPaint
+            PanelPaint;
         end
         else
           NextUnit(UnStartLoc, true);
-      end
+      end;
     end;
     case result of
@@ -6735 +6752 @@
       if result < rExecuted then
         Play('INVALID')
-    end
+    end;
   end;
 
@@ -6914 +6931 @@
   end
   else if UnFocus >= 0 then
-    with MyUn[UnFocus] do
+    with TUn(MyUn[UnFocus]) do
       if Sender = mGoOn then
       begin
@@ -6945 +6962 @@
       begin
         Centre(Loc);
-        PaintAllMaps
+        PaintAllMaps;
       end
       else if Sender = mCity then
@@ -6957 +6974 @@
             PaintAll;
             ZoomToCity(Loc0, true, chFounded);
-          end
+          end;
         end
         else
@@ -7018 +7035 @@
         if Job > jNone then
           Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-        NextUnit(UnStartLoc, true)
+        NextUnit(UnStartLoc, true);
       end
       else if Sender = mRecover then
@@ -7027 +7044 @@
         if Job > jNone then
           Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-        NextUnit(UnStartLoc, true)
+        NextUnit(UnStartLoc, true);
       end
       else if Sender = mNoOrders then
       begin
         Status := Status and not usWaiting;
-        NextUnit(UnStartLoc, true)
+        NextUnit(UnStartLoc, true);
+      end
+      else if Sender = mPrevUnit then
+      begin
+        Status := Status and not usWaiting;
+        FocusNextUnit(-1);
+      end
+      else if Sender = mNextUnit then
+      begin
+        Status := Status and not usWaiting;
+        FocusNextUnit(1);
       end
       else if Sender = mCancel then
@@ -7113 +7140 @@
               NextUnit(Loc, true)
             else
-              PanelPaint
+              PanelPaint;
           end
           else if i = eNoTime_Load then
@@ -8035 +8062 @@
 end;
 
-initialization
-
 end.