1.96 Release

RossenX · Oct 5, 2021 · 9d5d998 · 9d5d998
1 parent 15a6cf2
commit 9d5d998
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 28 deletions.
diff --git a/.vs/NullDC BEAR/v16/.suo b/.vs/NullDC BEAR/v16/.suo
diff --git a/NullDC CvS2 BEAR/Resources/Updates.zip b/NullDC CvS2 BEAR/Resources/Updates.zip
diff --git a/NullDC CvS2 BEAR/frmChallenge.vb b/NullDC CvS2 BEAR/frmChallenge.vb
@@ -47,10 +47,24 @@ Public Class frmChallenge
                 Label1.Invoke(Sub() Label1.Text = "Ping: N/A")
                 Exit Sub
             End If
-            Dim DelayFrameRate = 32.66 '32.66
-            Dim delay = Math.Ceiling(ping.RoundtripTime / DelayFrameRate)
-            If delay = 0 Then delay = 1
-            Label1.Invoke(Sub() Label1.Text = "Ping: " & ping.RoundtripTime & vbNewLine & "Delay: " & (ping.RoundtripTime / DelayFrameRate).ToString("0.##"))
+
+            If _Challenger.game.StartsWith("FC_") Or _Challenger.game.StartsWith("FLY_") Then
+                Dim DelayFrameRate = 64
+                Dim delay = Math.Floor(ping.RoundtripTime / DelayFrameRate)
+
+                If ping.RoundtripTime < DelayFrameRate Then
+                    delay = 0
+                End If
+
+                Label1.Invoke(Sub() Label1.Text = "Ping: " & ping.RoundtripTime & vbNewLine & "Delay: " & delay)
+
+            Else
+                Dim DelayFrameRate = 32 '32.66
+                Dim delay = Math.Ceiling(ping.RoundtripTime / DelayFrameRate)
+                If delay < 2 Then delay = 2
+                Label1.Invoke(Sub() Label1.Text = "Ping: " & ping.RoundtripTime & vbNewLine & "Delay: " & delay)
+            End If
+
         Catch ex As Exception
             Label1.Invoke(Sub() Label1.Text = "Ping: N/A")
         End Try

diff --git a/NullDC CvS2 BEAR/frmHostPanel.vb b/NullDC CvS2 BEAR/frmHostPanel.vb
@@ -152,10 +152,15 @@ Public Class frmHostPanel
             End If
 
             If MainformRef.ConfigFile.Game.StartsWith("FC_") Or MainformRef.ConfigFile.Game.StartsWith("FLY_") Then
-                Dim DelayFrameRate = 100
+                Dim DelayFrameRate = 64
                 Dim delay = Math.Floor(ping.RoundtripTime / DelayFrameRate)
+
+                If ping.RoundtripTime < DelayFrameRate Then
+                    delay = 0
+                End If
+
                 cbDelay.Invoke(Sub() cbDelay.Text = delay)
-                lbPing.Invoke(Sub() lbPing.Text = "Ping: " & ping.RoundtripTime & " | Delay rating: " & (ping.RoundtripTime / DelayFrameRate).ToString("0.##"))
+                lbPing.Invoke(Sub() lbPing.Text = "Ping: " & ping.RoundtripTime & " | Delay: " & delay)
 
             Else
                 Dim DelayFrameRate = 32 '32.66

diff --git a/NullDC CvS2 BEAR/frmKeyMapperSDL.vb b/NullDC CvS2 BEAR/frmKeyMapperSDL.vb
@@ -1663,13 +1663,8 @@ Public Class frmKeyMapperSDL
     Private Sub ControllerCB_SelectedIndexChanged(sender As Object, e As EventArgs)
 
         Try
-            'Console.Write("Changing Controller ")
-            If Not Joy = Nothing Then
-                If SDL_GameControllerGetAttached(Joy) = SDL_bool.SDL_TRUE Then
-                    SDL_GameControllerClose(Joy)
-                End If
-                Joy = Nothing
-            End If
+            SDL_GameControllerClose(Joy)
+            Joy = Nothing
 
             If ControllerCB.SelectedValue >= 0 Then
                 Joy = SDL_GameControllerOpen(ControllerCB.SelectedValue)

diff --git a/NullDC CvS2 BEAR/frmMain.Designer.vb b/NullDC CvS2 BEAR/frmMain.Designer.vb
diff --git a/NullDC CvS2 BEAR/frmMain.resx b/NullDC CvS2 BEAR/frmMain.resx
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACw
-        lwAAAk1TRnQBSQFMAgEBDwEAAbABDAGwAQwBIAEAASABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        lwAAAk1TRnQBSQFMAgEBDwEAAdABDAHQAQwBIAEAASABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABgAMAAQEBAAEQBgABgJIAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/
         AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/
         AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX/AAAH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/

diff --git a/NullDC CvS2 BEAR/frmMain.vb b/NullDC CvS2 BEAR/frmMain.vb
@@ -6,7 +6,7 @@ Imports System.Text
 Imports System.Threading
 
 Public Class frmMain
-    Public IsBeta As Boolean = True
+    Public IsBeta As Boolean = False
 
     ' Update Stuff
     Dim UpdateCheckClient As New WebClient
@@ -2291,16 +2291,13 @@ UpdateTry:
         Process.Start("https://discord.gg/u2YzdNB6SN")
     End Sub
 
-    Private Sub PatreonO3oToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PatreonO3oToolStripMenuItem.Click
-        Process.Start("https://www.patreon.com/NullDCBEAR")
-    End Sub
-
     Private Sub FreeDLCToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FreeDLCToolStripMenuItem.Click
         If Not Application.OpenForms().OfType(Of frmDLC).Any Then
             frmDLC.Show(Me)
         Else
             frmDLC.Focus()
         End If
+
     End Sub
 
     Private Sub MednafenOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs)
@@ -2473,6 +2470,13 @@ UpdateTry:
         End If
     End Sub
 
+    Private Sub BEARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BEARToolStripMenuItem.Click
+        Process.Start("https://www.patreon.com/NullDCBEAR")
+    End Sub
+
+    Private Sub FlycastToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FlycastToolStripMenuItem.Click
+        Process.Start("https://www.paypal.com/paypalme/FlycastEmu")
+    End Sub
 End Class
 
 Public Class BEARPlayer