Skip to content

Commit 2bc8fb1

Browse files
committed
Automatic merge of T1.5.1-1689-g72674c98d and 16 pull requests
- Pull request #900 at 4629736: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes - Pull request #1052 at 5bbc476: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at 3b18c48: Train Forces popup Window. - Pull request #1064 at 9b3415e: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1000 at d8d9709: Locomotive operation from control car - Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes - Pull request #1057 at 389c2d2: Switchable brake system - Pull request #1065 at 409064d: Fix for PantographToggle sound event - Pull request #1068 at d6e1f83: Build for online-only documentation files - Pull request #1069 at ffd1af4: Mouse wheel control only with Alt – Followup for #1051 - Pull request #1055 at 90bbcff: Route Based TTrack Sounds - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
18 parents 747c103 + 72674c9 + 4629736 + d3ae4a2 + cc4d53c + 5bbc476 + 3b18c48 + 9b3415e + 62c89c1 + 1f5ba4c + d8d9709 + 92c74ef + 389c2d2 + 409064d + d6e1f83 + ffd1af4 + 90bbcff + f1681df commit 2bc8fb1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Source/RunActivity/Viewer3D/Cameras.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ protected void ZoomByMouseWheel(float speed)
270270
{
271271
// Will not zoom-in-out when help windows is up.
272272
// TODO: Property input processing through WindowManager.
273-
if (UserInput.IsMouseWheelChanged && !Viewer.HelpWindow.Visible && !Viewer.RenderProcess.IsMouseVisible)
273+
if (UserInput.IsMouseWheelChanged && !UserInput.IsDown(UserCommand.GameSwitchWithMouse) && !Viewer.HelpWindow.Visible)
274274
{
275275
var fieldOfView = MathHelper.Clamp(FieldOfView - speed * UserInput.MouseWheelChange / 10, 1, 135);
276276
new FieldOfViewCommand(Viewer.Log, fieldOfView);

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,9 +2340,10 @@ public virtual int GetDrawIndex()
23402340
/// </summary>
23412341
float NormalizedMouseMovement()
23422342
{
2343+
var mouseWheelChange = UserInput.IsDown(UserCommand.GameSwitchWithMouse) ? UserInput.MouseWheelChange : 0;
23432344
return (ControlDiscrete.Orientation > 0
2344-
? (float)(UserInput.MouseMoveY + UserInput.MouseWheelChange) / (float)Control.Height
2345-
: (float)(UserInput.MouseMoveX + UserInput.MouseWheelChange) / (float)Control.Width)
2345+
? (float)(UserInput.MouseMoveY + mouseWheelChange) / (float)Control.Height
2346+
: (float)(UserInput.MouseMoveX + mouseWheelChange) / (float)Control.Width)
23462347
* (ControlDiscrete.Direction > 0 ? -1 : 1);
23472348
}
23482349

0 commit comments

Comments
 (0)