From 0b9c71afb2ffb15dafc3f817201814ca1eff696d Mon Sep 17 00:00:00 2001 From: SilentSys Date: Thu, 3 Mar 2016 17:09:53 -0800 Subject: [PATCH] v1.3.1 * Fixed System.Runtime.Serialization.SerializationException exception. --- SLAM/Form1.vb | 7 +++---- SLAM/My Project/AssemblyInfo.vb | 4 ++-- SLAM/SLAM.vbproj | 1 - SLAM/SourceGame.vb | 12 +++++++++--- SLAM/Track.vb | 8 -------- 5 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 SLAM/Track.vb diff --git a/SLAM/Form1.vb b/SLAM/Form1.vb index 40856aa..225425e 100644 --- a/SLAM/Form1.vb +++ b/SLAM/Form1.vb @@ -5,7 +5,6 @@ Imports System.Text.RegularExpressions Imports System.Threading Imports SLAM.XmlSerialization Imports SLAM.SourceGame -Imports SLAM.Track Imports System.Net.Http Public Class Form1 @@ -782,10 +781,10 @@ Public Class Form1 For Each index In TrackList.SelectedIndices GetCurrentGame.tracks(index).volume = SetVolumeDialog.Volume - SaveTrackKeys(GetCurrentGame) - ReloadTracks(GetCurrentGame) - RefreshTrackList() Next + SaveTrackKeys(GetCurrentGame) + ReloadTracks(GetCurrentGame) + RefreshTrackList() End If diff --git a/SLAM/My Project/AssemblyInfo.vb b/SLAM/My Project/AssemblyInfo.vb index 6161e1c..146d9f6 100644 --- a/SLAM/My Project/AssemblyInfo.vb +++ b/SLAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/SLAM/SLAM.vbproj b/SLAM/SLAM.vbproj index a87aa05..7f1a0d2 100644 --- a/SLAM/SLAM.vbproj +++ b/SLAM/SLAM.vbproj @@ -137,7 +137,6 @@ UserControl - TrimForm.vb diff --git a/SLAM/SourceGame.vb b/SLAM/SourceGame.vb index 830aeb9..33a9fa4 100644 --- a/SLAM/SourceGame.vb +++ b/SLAM/SourceGame.vb @@ -1,6 +1,4 @@ -Imports SLAM.Track - -Public Class SourceGame +Public Class SourceGame Public name As String Public id As Integer Public directory As String @@ -19,4 +17,12 @@ Public Class SourceGame Public tracks As New List(Of Track) Public blacklist As New List(Of String) From {"slam", "slam_listtracks", "list", "tracks", "la", "slam_play", "slam_play_on", "slam_play_off", "slam_updatecfg", "slam_curtrack", "slam_saycurtrack", "slam_sayteamcurtrack"} + Public Class track + Public name As String + Public tags As New List(Of String) + Public hotkey As String = vbNullString + Public volume As Integer = 100 + Public startpos As Integer + Public endpos As Integer + End Class End Class \ No newline at end of file diff --git a/SLAM/Track.vb b/SLAM/Track.vb deleted file mode 100644 index e673811..0000000 --- a/SLAM/Track.vb +++ /dev/null @@ -1,8 +0,0 @@ -Public Class Track - Public name As String - Public tags As New List(Of String) - Public hotkey As String = vbNullString - Public volume As Integer = 100 - Public startpos As Integer - Public endpos As Integer -End Class \ No newline at end of file