Further fixes

Author: cesarBLG

Source/RunActivity/Viewer3D/UserInputRailDriver.cs

@@ -133,8 +133,6 @@ public RailDriverState(Game game)
             Commands[UserCommand.ControlBailOff] = new ExternalDeviceButton();
             Commands[UserCommand.ControlWiper] = new ExternalDeviceButton();
 
-            //Activation = new RailDriverButton(1, 0x40);
-
             CabControls[(new CabViewControlType(CABViewControlTypes.DIRECTION), -1)] = Direction;
             CabControls[(new CabViewControlType(CABViewControlTypes.THROTTLE), -1)] = Throttle;
             CabControls[(new CabViewControlType(CABViewControlTypes.TRAIN_BRAKE), -1)] = TrainBrake;
@@ -296,8 +294,8 @@ public class RailDriverButton : ExternalDeviceButton
         byte Mask;
         public RailDriverButton(byte command)
         {
-            Index = command / 8;
-            Mask = (byte)(command % 8);
+            Index = 8 + command / 8;
+            Mask = (byte)(1 << (command % 8));
         }
         public void Update(byte[] data)
         {

Source/RunActivity/Viewer3D/Viewer.cs

@@ -1,4 +1,4 @@
-// COPYRIGHT 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 by the Open Rails project.
+// COPYRIGHT 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 by the Open Rails project.
 //
 // This file is part of Open Rails.
 //
@@ -759,6 +759,8 @@ public void Update(RenderFrame frame, float elapsedRealTime)
                 MPManager.Instance().Update(Simulator.GameTime);
             }
 
+            UserInput.RDState.ShowSpeed(MpS.FromMpS(PlayerLocomotive.SpeedMpS, PlayerLocomotive.IsMetric));
+
             // This has to be done also for stopped trains
             var cars = World.Trains.Cars;
             foreach (var car in cars)
@@ -1577,8 +1579,7 @@ void HandleUserInput(ElapsedTime elapsedTime)
                 }
             }
 
-            if (UserInput.RDState != null)
-                UserInput.RDState.Handled();
+            UserInput.Handled();
 
             MouseState currentMouseState = Mouse.GetState();