Changeset 660

Timestamp:

Jul 4, 2025, 9:07:01 PM (3 weeks ago)

Author:

chronos

Message:

• Fixed: Do not process keyboard input during unit attack on Linux.
• Fixed: Limit world size loaded from registry.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (4 diffs)
• Start.pas (modified) (1 diff)

trunk/LocalPlayer/Term.pas

@@ -352 +352 @@
     FMessgExDlg: TMessgExDlg;
     FHelpDlg: THelpDlg;
+    procedure ProcessMessagesWithDisabledKeyboard;
     procedure ResizeControls;
     procedure ArrangeDialogs;
@@ -6521 +6522 @@
 end;
 
+procedure TMainScreen.ProcessMessagesWithDisabledKeyboard;
+begin
+  {$IFDEF UNIX}
+  // TODO: Force animation under UNIX. Causes also to process keyboard events
+  // which can lead to unexpected errors.
+  KeyboardDisabled := True;
+  try
+    Application.ProcessMessages;
+  finally
+    KeyboardDisabled := False;
+  end;
+  {$ENDIF}
+end;
+
 procedure TMainScreen.MoveOnScreen(ShowMove: TShowMove;
   Step0, Step1, nStep: Integer; Restore: Boolean = True);
@@ -6603 +6618 @@
       NoMap.PaintUnit(xMoving - xMin, yMoving - yMin, UnitInfo, 0);
       PaintBufferToScreen(xMin, yMin, xRange, yRange);
-      {$IFDEF UNIX}
-      // TODO: Force animation under UNIX. Causes also to process keyboard events
-      // which can lead to unexpected errors.
-      KeyboardDisabled := True;
-      try
-        Application.ProcessMessages;
-      finally
-        KeyboardDisabled := False;
-      end;
-      {$ENDIF}
+
+      ProcessMessagesWithDisabledKeyboard;
 
       SliceCount := 0;
@@ -6622 +6629 @@
         begin
           if not Idle or (GameMode = cMovie) then
-            Application.ProcessMessages;
+            ProcessMessagesWithDisabledKeyboard;
           Sleep(1);
           Inc(SliceCount);

trunk/Start.pas

@@ -389 +389 @@
     if ValueExists('WorldSize') then WorldSize := Reg.ReadInteger('WorldSize')
       else WorldSize := DefaultWorldSize;
+    if WorldSize > MaxWorldSize then WorldSize := MaxWorldSize;
+    if WorldSize > 0 then WorldSize := 0;
     if ValueExists('LandMass') then StartLandMass := Reg.ReadInteger('LandMass')
       else StartLandMass := DefaultLandMass;