review cesarBLG: abstract away call SwitchPanelModule.IsUp into UserInput

sweiland-openrails · sweiland-openrails · commit f13aba139a4b · 2023-09-15T19:55:53.000+02:00
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -321,7 +321,7 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
                         train.DbfEvalValueChanged = true;//Debrief eval
                     }
                 }
-                else if (UserInput.IsReleased(command) || SwitchPanelModule.IsUp(command))
+                else if (UserInput.IsReleased(command))
                 {
                     UserInputCommands[command][0]();
                     //Debrief eval
diff --git a/Source/RunActivity/Viewer3D/UserInput.cs b/Source/RunActivity/Viewer3D/UserInput.cs
@@ -157,7 +157,8 @@ public static bool IsReleased(UserCommand command)
             if (RDState != null && RDState.IsReleased(command))
                 return true;
             var setting = InputSettings.Commands[(int)command];
-            return !setting.IsKeyDown(KeyboardState) && setting.IsKeyDown(LastKeyboardState);
+            return (!setting.IsKeyDown(KeyboardState) && setting.IsKeyDown(LastKeyboardState)) ||
+                SwitchPanelModule.IsUp(command);
         }
 
         public static bool IsDown(UserCommand command)

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ public override void HandleUserInput(ElapsedTime elapsedTime)`
`321`	`321`	`train.DbfEvalValueChanged = true;//Debrief eval`
`322`	`322`	`}`
`323`	`323`	`}`
`324`		`- else if (UserInput.IsReleased(command) \|\| SwitchPanelModule.IsUp(command))`
	`324`	`+ else if (UserInput.IsReleased(command))`
`325`	`325`	`{`
`326`	`326`	`UserInputCommands[command][0]();`
`327`	`327`	`//Debrief eval`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,8 @@ public static bool IsReleased(UserCommand command)`
`157`	`157`	`if (RDState != null && RDState.IsReleased(command))`
`158`	`158`	`return true;`
`159`	`159`	`var setting = InputSettings.Commands[(int)command];`
`160`		`- return !setting.IsKeyDown(KeyboardState) && setting.IsKeyDown(LastKeyboardState);`
	`160`	`+ return (!setting.IsKeyDown(KeyboardState) && setting.IsKeyDown(LastKeyboardState)) \|\|`
	`161`	`+ SwitchPanelModule.IsUp(command);`
`161`	`162`	`}`
`162`	`163`
`163`	`164`	`public static bool IsDown(UserCommand command)`