Make DisableFuzzyMatching default true

vpinball · Sep 22, 2023 · b752605 · b752605
1 parent ca459cc
commit b752605
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,10 @@
+2.1.0
+
+- B2STools\directb2sReelSoundsONOFF: A small cmd and xsl transformation routine to add/remove Sound tags in directb2s files.
+  The directb2s files can be dropped on the cmd file and it will create a copy of the file with the change applied.
+  When the empty Sound3-6 attributes are available, the reel sound is deactivated.
+- Make DisableFuzzyMatching default true (was already, but not everywhere)
+
 2.0.3
 
 - B2SBackglassServerEXE: For activated background pictures, it is possible to enter a path with placeholders for "keys" in the table name.
@@ -9,7 +16,7 @@
 
 2.0.2
 
-- When the B2SBackglassServerEXE is started from the explorer by doubleclicking a directb2s file, the save settings button is deactivated.
+- When the B2SBackglassServerEXE is started from windows explorer by doubleclicking a directb2s file, the save settings button is deactivated.
 
 2.0.1
 

diff --git a/b2sbackglassserver/b2sbackglassserver/Classes/B2SSettings.vb b/b2sbackglassserver/b2sbackglassserver/Classes/B2SSettings.vb
@@ -151,7 +151,7 @@ Public Class B2SSettings
     Public Shared Property LEDsOff() As Boolean = False
     Public Shared Property StartAsEXE() As Boolean = True
     Public Shared Property DefaultStartMode() As eDefaultStartMode = eDefaultStartMode.EXE
-    Public Shared Property DisableFuzzyMatching() As Boolean = False
+    Public Shared Property DisableFuzzyMatching() As Boolean = True
 
     Public Shared Property LampsSkipFrames() As Integer = 0
     Public Shared Property SolenoidsSkipFrames() As Integer = 0

diff --git a/b2sbackglassserverexe/b2sbackglassserverexe/Classes/B2SSettings.vb b/b2sbackglassserverexe/b2sbackglassserverexe/Classes/B2SSettings.vb
@@ -78,7 +78,7 @@ Public Class B2SSettings
     Public Shared Property StartAsEXE() As Boolean = True
     Public Shared Property PureEXE() As Boolean = False
     Public Shared Property DefaultStartMode() As eDefaultStartMode = eDefaultStartMode.EXE
-    Public Shared Property DisableFuzzyMatching() As Boolean = False
+    Public Shared Property DisableFuzzyMatching() As Boolean = True
 
     Public Shared Property LampsSkipFrames() As Integer = 0
     Public Shared Property SolenoidsSkipFrames() As Integer = 0
@@ -90,6 +90,7 @@ Public Class B2SSettings
     Public Shared Property IsGlowBulbOn() As Boolean = False
     Public Shared Property GlowIndex() As Integer = -1
     Public Shared Property DefaultGlow() As Integer = -1
+    Public Shared Property DisableBuiltInEMReelSound() As Nullable(Of Boolean) = Nothing
     Public Shared Property FormToFront() As Boolean = True
     Public Shared Property FormToBack() As Boolean = False
     Public Shared Property FormNoFocus() As Boolean = False
@@ -185,6 +186,7 @@ Public Class B2SSettings
                 If nodeHeader.SelectSingleNode("DisableFuzzyMatching") IsNot Nothing Then DisableFuzzyMatching = (nodeHeader.SelectSingleNode("DisableFuzzyMatching").InnerText = "1")
 
                 ' get overall settings
+                If nodeHeader.SelectSingleNode("DisableBuiltInEMReelSound") IsNot Nothing Then DisableBuiltInEMReelSound = (nodeHeader.SelectSingleNode("DisableBuiltInEMReelSound").InnerText = "1")
                 If nodeHeader.SelectSingleNode("CPUAffinityMask") IsNot Nothing Then CPUAffinityMask = CInt(nodeHeader.SelectSingleNode("CPUAffinityMask").InnerText)
                 If nodeHeader.SelectSingleNode("LogPath") IsNot Nothing Then LogPath = nodeHeader.SelectSingleNode("LogPath").InnerText
                 If nodeHeader.SelectSingleNode("IsLampsStateLogOn") IsNot Nothing Then IsLampsStateLogOn = (nodeHeader.SelectSingleNode("IsLampsStateLogOn").InnerText = "1")
@@ -234,6 +236,7 @@ Public Class B2SSettings
                     Dim nodeTable As Xml.XmlElement = nodeHeader.SelectSingleNode(If(Not String.IsNullOrEmpty(GameName), GameName, B2SName))
                     If nodeTable IsNot Nothing Then
                         _IsGameNameFound = True
+                        If nodeTable.SelectSingleNode("DisableBuiltInEMReelSound") IsNot Nothing Then DisableBuiltInEMReelSound = (nodeTable.SelectSingleNode("DisableBuiltInEMReelSound").InnerText = "1")
                         If nodeTable.SelectSingleNode("HideGrill") IsNot Nothing Then HideGrill = CInt(nodeTable.SelectSingleNode("HideGrill").InnerText)
                         If nodeTable.SelectSingleNode("HideB2SDMD") IsNot Nothing Then HideB2SDMD = (nodeTable.SelectSingleNode("HideB2SDMD").InnerText = "1")
                         If nodeTable.SelectSingleNode("HideDMD") IsNot Nothing Then HideDMD = CInt(nodeTable.SelectSingleNode("HideDMD").InnerText)
@@ -334,6 +337,10 @@ Public Class B2SSettings
                 If StartBackground.HasValue Then
                     AddNode(XML, nodeTable, "StartBackground", If(StartBackground, "1", "0"))
                 End If
+                If DisableBuiltInEMReelSound.HasValue Then
+                    AddNode(XML, nodeTable, "DisableBuiltInEMReelSound", If(DisableBuiltInEMReelSound, "1", "0"))
+                End If
+
                 AddNode(XML, nodeTable, "FormToFront", If(FormToFront, "1", "0"))
                 AddNode(XML, nodeTable, "FormToBack", If(FormToBack, "1", "0"))
                 AddNode(XML, nodeTable, "FormNoFocus", If(FormNoFocus, "1", "0"))