Merge pull request #894 from Roeterdink/CorrectDecreaseColour

Author: Looky1173

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -894,11 +894,19 @@ public CVCDigital(STFReader stf, string basepath)
                     }),
                 new STFReader.TokenProcessor("decreasecolour", ()=>{
                     stf.MustMatch("(");
-                    stf.ReadInt(0);
+                    int NumColor = stf.ReadInt(0);
                     if(stf.EndOfBlock() == false)
                     {
-                        stf.ParseBlock(new STFReader.TokenProcessor[] {
-                            new STFReader.TokenProcessor("controlcolour", ()=>{ DecreaseColor = ParseControlColor(stf); }) });
+                        if (NumColor == 0)
+                        {
+                            // no. of colors is set as 0 and therefor no color is defined, but if set anyway, it must be skipped
+                            stf.SkipRestOfBlock();
+                        }
+                        else
+                        {
+                            stf.ParseBlock(new STFReader.TokenProcessor[] {
+                                new STFReader.TokenProcessor("controlcolour", ()=>{ DecreaseColor = ParseControlColor(stf); }) });
+                        }
                     }
                 }),
                 new STFReader.TokenProcessor("ortsfont", ()=>{ParseFont(stf); }),

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -3079,6 +3079,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
             //          <CSComment> Now speedometer is handled like the other digitals
 
             base.PrepareFrame(frame, elapsedTime);
+            digital.OldValue = Num;
         }
 
         public override void Draw(GraphicsDevice graphicsDevice)
@@ -3152,6 +3153,8 @@ public string GetDigits(out Color DrawColor)
                     displayedText = String.Format(Format, Num);
                     DrawColor = Color.White;
                 }
+                digital.OldValue = Num;
+
                 // <CSComment> Speedometer is now managed like the other digitals
 
                 return displayedText;
@@ -3228,6 +3231,8 @@ public string GetDigits(out Color DrawColor)
                 {
                     displayedText = String.Format(Format, Num);
                 }
+                digital.OldValue = Num;
+
                 // <CSComment> Speedometer is now managed like the other digitals
 
                 return displayedText;