diff options
| author | TheUltimateHacker <[email protected]> | 2015-03-16 09:19:34 -0400 |
|---|---|---|
| committer | TheUltimateHacker <[email protected]> | 2015-03-16 09:19:34 -0400 |
| commit | 93d62dcac2c8ceb10d2f839614ca83c12c5902ee (patch) | |
| tree | 3818e6a48f43c97d0dcd4a52a05b50ee3a33bea0 /ShiftOS/ShiftOSDesktop.vb | |
| parent | 6278dd2510d692446e2baf0b079850e3e0250f2e (diff) | |
| parent | dda2964b748eafb3ff1105966f8a349069834cc0 (diff) | |
| download | shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.tar.gz shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.tar.bz2 shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
ShiftOS/skins.vb
Diffstat (limited to 'ShiftOS/ShiftOSDesktop.vb')
| -rw-r--r-- | ShiftOS/ShiftOSDesktop.vb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ShiftOS/ShiftOSDesktop.vb b/ShiftOS/ShiftOSDesktop.vb index 8a8276a..d0e19ef 100644 --- a/ShiftOS/ShiftOSDesktop.vb +++ b/ShiftOS/ShiftOSDesktop.vb @@ -15,7 +15,7 @@ Public newgame As Boolean = False Public lastcolourpick As Color = Color.Gray Public programsopen As Integer = 0 - Public ShiftOSPath As String = "C:\ShiftOS\" + Public ShiftOSPath As String = "C:\ShiftOS" Private actualshiftversion As String = "0.0.8" Public ingameversion As String = "0.0.1.0" @@ -1062,16 +1062,16 @@ SortOutBooleans(WebBrowserCorrupted, 613, False) If boughtdesktopicons = True Then savelines(614) = 11 Else savelines(614) = 10 If boughtadvapplauncher = True Then savelines(615) = 11 Else savelines(615) = 10 - IO.File.WriteAllLines(ShiftOSPath + "Shiftum42\Drivers\HDD.dri", savelines) - File_Crypt.EncryptFile(ShiftOSPath + "Shiftum42\Drivers\HDD.dri", "C:/ShiftOS/Shiftum42/SKernal.sft", sSecretKey) + IO.File.WriteAllLines(Paths.savedata & "Drivers\HDD.dri", savelines) + File_Crypt.EncryptFile(Paths.savedata & "Drivers\HDD.dri", Paths.savedata & "SKernal.sft", sSecretKey) Try - Dim sw As New IO.StreamWriter(ShiftOSPath & "SoftwareData\DownloadManager\Downloadhistory.lst") + Dim sw As New IO.StreamWriter(Paths.dnldata & "Downloadhistory.lst") sw.Write(downloadmanagerhistory) sw.Close() Catch ex As Exception End Try - Dim objWriter As New System.IO.StreamWriter("C:/ShiftOS/Shiftum42/HDAccess.sft", False) + Dim objWriter As New System.IO.StreamWriter(Paths.savedata & "HDAccess.sft", False) objWriter.Write(actualshiftversion) objWriter.Close() @@ -1090,8 +1090,8 @@ End Sub Private Sub loadgame() - File_Crypt.DecryptFile("C:/ShiftOS/Shiftum42/SKernal.sft", ShiftOSPath + "Shiftum42\Drivers\HDD.dri", sSecretKey) - loadlines = IO.File.ReadAllLines(ShiftOSPath + "Shiftum42\Drivers\HDD.dri") + File_Crypt.DecryptFile(Paths.savedata & "SKernal.sft", Paths.savedata & "Drivers\HDD.dri", sSecretKey) + loadlines = IO.File.ReadAllLines(Paths.savedata & "Drivers\HDD.dri") If loadlines(0) = 11 Then boughttitlebar = True Else boughttitlebar = False If loadlines(1) = 11 Then boughtgray = True Else boughtgray = False |