From d46caa1fa52b0e6dae8dc85c3982aa47b4c11406 Mon Sep 17 00:00:00 2001 From: Pascal Date: Wed, 1 Feb 2017 18:13:11 +0100 Subject: [PATCH] Changed minor things and added ToolTips. --- SMBX Magic Patcher/Form1.Designer.vb | 34 ++++++++++++++++++++++++++-- SMBX Magic Patcher/Form1.resx | 7 ++++++ SMBX Magic Patcher/Form1.vb | 20 ++++++++-------- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/SMBX Magic Patcher/Form1.Designer.vb b/SMBX Magic Patcher/Form1.Designer.vb index d8382d8..bd6386f 100644 --- a/SMBX Magic Patcher/Form1.Designer.vb +++ b/SMBX Magic Patcher/Form1.Designer.vb @@ -66,6 +66,7 @@ Partial Class Form1 Me.ButtonX1 = New DevComponents.DotNetBar.ButtonX() Me.TextBoxX_PatchFileCreate = New DevComponents.DotNetBar.Controls.TextBoxX() Me.TextBoxX_OriginalLevelCreate = New DevComponents.DotNetBar.Controls.TextBoxX() + Me.SuperTooltip1 = New DevComponents.DotNetBar.SuperTooltip() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -148,7 +149,7 @@ Partial Class Form1 Me.LabelX4.Name = "LabelX4" Me.LabelX4.Size = New System.Drawing.Size(72, 23) Me.LabelX4.TabIndex = 39 - Me.LabelX4.Text = "Patch file:" + Me.LabelX4.Text = "Patch:" ' 'LabelX6 ' @@ -170,6 +171,7 @@ Partial Class Form1 Me.ButtonX4.Name = "ButtonX4" Me.ButtonX4.Size = New System.Drawing.Size(33, 23) Me.ButtonX4.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX4, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select the patch here.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX4.Symbol = "58055" Me.ButtonX4.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material Me.ButtonX4.SymbolSize = 15.0! @@ -187,6 +189,7 @@ Partial Class Form1 Me.TextBoxX_PatchFileApply.PreventEnterBeep = True Me.TextBoxX_PatchFileApply.ReadOnly = True Me.TextBoxX_PatchFileApply.Size = New System.Drawing.Size(215, 20) + Me.SuperTooltip1.SetSuperTooltip(Me.TextBoxX_PatchFileApply, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select the patch here.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.TextBoxX_PatchFileApply.TabIndex = 35 Me.TextBoxX_PatchFileApply.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty Me.TextBoxX_PatchFileApply.WatermarkText = "No file loaded!" @@ -199,6 +202,7 @@ Partial Class Form1 Me.ButtonX6.Name = "ButtonX6" Me.ButtonX6.Size = New System.Drawing.Size(33, 23) Me.ButtonX6.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX6, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select here your level on wich you would apply the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX6.Symbol = "58055" Me.ButtonX6.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material Me.ButtonX6.SymbolSize = 15.0! @@ -216,6 +220,7 @@ Partial Class Form1 Me.TextBoxX_OriginalLevelApply.PreventEnterBeep = True Me.TextBoxX_OriginalLevelApply.ReadOnly = True Me.TextBoxX_OriginalLevelApply.Size = New System.Drawing.Size(215, 20) + Me.SuperTooltip1.SetSuperTooltip(Me.TextBoxX_OriginalLevelApply, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select here your level on wich you would apply the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.TextBoxX_OriginalLevelApply.TabIndex = 31 Me.TextBoxX_OriginalLevelApply.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty Me.TextBoxX_OriginalLevelApply.WatermarkText = "No file loaded!" @@ -293,6 +298,7 @@ Partial Class Form1 Me.GroupBox1.Location = New System.Drawing.Point(6, 118) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Size = New System.Drawing.Size(330, 136) + Me.SuperTooltip1.SetSuperTooltip(Me.GroupBox1, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Check which things you would include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.GroupBox1.TabIndex = 1 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Settings" @@ -310,6 +316,7 @@ Partial Class Form1 Me.SwitchButton_Liquids.OnText = "Yes" Me.SwitchButton_Liquids.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Liquids.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Liquids, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Liquids will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.SwitchButton_Liquids.TabIndex = 49 ' 'LabelX8 @@ -349,6 +356,7 @@ Partial Class Form1 Me.SwitchButton_Layers.OnText = "Yes" Me.SwitchButton_Layers.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Layers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Layers, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Layers will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.SwitchButton_Layers.TabIndex = 48 Me.SwitchButton_Layers.Value = True Me.SwitchButton_Layers.ValueObject = "Y" @@ -366,6 +374,7 @@ Partial Class Form1 Me.SwitchButton_Scripts.OnText = "Yes" Me.SwitchButton_Scripts.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Scripts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Scripts, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Scripts will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.SwitchButton_Scripts.TabIndex = 42 Me.SwitchButton_Scripts.Value = True Me.SwitchButton_Scripts.ValueObject = "Y" @@ -407,6 +416,7 @@ Partial Class Form1 Me.SwitchButton_Variables.OnText = "Yes" Me.SwitchButton_Variables.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Variables.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Variables, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Local Variables will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.SwitchButton_Variables.TabIndex = 46 Me.SwitchButton_Variables.Value = True Me.SwitchButton_Variables.ValueObject = "Y" @@ -424,6 +434,7 @@ Partial Class Form1 Me.SwitchButton_Events.OnText = "Yes" Me.SwitchButton_Events.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Events.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Events, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Events will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.SwitchButton_Events.TabIndex = 44 Me.SwitchButton_Events.Value = True Me.SwitchButton_Events.ValueObject = "Y" @@ -465,6 +476,8 @@ Partial Class Form1 Me.SwitchButton_BlocksEtc.OnText = "Yes" Me.SwitchButton_BlocksEtc.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_BlocksEtc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_BlocksEtc, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all Blocks, NPC's and Backgrounds will include in the patch" & + ".", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.SwitchButton_BlocksEtc.TabIndex = 34 ' 'LabelX9 @@ -504,6 +517,8 @@ Partial Class Form1 Me.SwitchButton_Configs.OnText = "Yes" Me.SwitchButton_Configs.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Configs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Configs, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all custom configrations (like Custom NPC Configs) will inc" & + "lude in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.SwitchButton_Configs.TabIndex = 38 Me.SwitchButton_Configs.Value = True Me.SwitchButton_Configs.ValueObject = "Y" @@ -521,6 +536,7 @@ Partial Class Form1 Me.SwitchButton_Graphics.OnText = "Yes" Me.SwitchButton_Graphics.Size = New System.Drawing.Size(57, 23) Me.SwitchButton_Graphics.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled + Me.SuperTooltip1.SetSuperTooltip(Me.SwitchButton_Graphics, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "If this is ""Yes"" then all custom graphics will include in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.SwitchButton_Graphics.TabIndex = 36 Me.SwitchButton_Graphics.Value = True Me.SwitchButton_Graphics.ValueObject = "Y" @@ -537,6 +553,7 @@ Partial Class Form1 Me.CheckBoxX2.Name = "CheckBoxX2" Me.CheckBoxX2.Size = New System.Drawing.Size(100, 23) Me.CheckBoxX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.SuperTooltip1.SetSuperTooltip(Me.CheckBoxX2, New DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("CheckBoxX2.SuperTooltip"), Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.CheckBoxX2.TabIndex = 32 Me.CheckBoxX2.Text = "use custom level" ' @@ -555,6 +572,7 @@ Partial Class Form1 Me.CheckBoxX1.Name = "CheckBoxX1" Me.CheckBoxX1.Size = New System.Drawing.Size(100, 23) Me.CheckBoxX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.SuperTooltip1.SetSuperTooltip(Me.CheckBoxX1, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Use this option, if you would like to create a patch of your whole level.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.CheckBoxX1.TabIndex = 31 Me.CheckBoxX1.Text = "use empty level" ' @@ -577,7 +595,7 @@ Partial Class Form1 Me.LabelX3.Name = "LabelX3" Me.LabelX3.Size = New System.Drawing.Size(72, 23) Me.LabelX3.TabIndex = 29 - Me.LabelX3.Text = "Patch file:" + Me.LabelX3.Text = "Save as:" ' 'LabelX2 ' @@ -611,6 +629,7 @@ Partial Class Form1 Me.ButtonX3.Name = "ButtonX3" Me.ButtonX3.Size = New System.Drawing.Size(33, 23) Me.ButtonX3.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX3, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Open here your level with the feautures wich should be in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX3.Symbol = "58055" Me.ButtonX3.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material Me.ButtonX3.SymbolSize = 15.0! @@ -628,6 +647,7 @@ Partial Class Form1 Me.TextBoxX_ModifiedLevel.PreventEnterBeep = True Me.TextBoxX_ModifiedLevel.ReadOnly = True Me.TextBoxX_ModifiedLevel.Size = New System.Drawing.Size(215, 20) + Me.SuperTooltip1.SetSuperTooltip(Me.TextBoxX_ModifiedLevel, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Open here your level with the feautures wich should be in the patch.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.TextBoxX_ModifiedLevel.TabIndex = 25 Me.TextBoxX_ModifiedLevel.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty Me.TextBoxX_ModifiedLevel.WatermarkText = "No file loaded!" @@ -640,6 +660,7 @@ Partial Class Form1 Me.ButtonX2.Name = "ButtonX2" Me.ButtonX2.Size = New System.Drawing.Size(33, 23) Me.ButtonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX2, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select here where the patch file should be saved.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX2.Symbol = "57697" Me.ButtonX2.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material Me.ButtonX2.SymbolSize = 15.0! @@ -654,6 +675,7 @@ Partial Class Form1 Me.ButtonX1.Name = "ButtonX1" Me.ButtonX1.Size = New System.Drawing.Size(33, 23) Me.ButtonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005 + Me.SuperTooltip1.SetSuperTooltip(Me.ButtonX1, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Open the ""without feauture"" level here.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.ButtonX1.Symbol = "58055" Me.ButtonX1.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material Me.ButtonX1.SymbolSize = 15.0! @@ -671,6 +693,7 @@ Partial Class Form1 Me.TextBoxX_PatchFileCreate.PreventEnterBeep = True Me.TextBoxX_PatchFileCreate.ReadOnly = True Me.TextBoxX_PatchFileCreate.Size = New System.Drawing.Size(215, 20) + Me.SuperTooltip1.SetSuperTooltip(Me.TextBoxX_PatchFileCreate, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Select here where the patch file should be saved.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.TextBoxX_PatchFileCreate.TabIndex = 22 Me.TextBoxX_PatchFileCreate.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty Me.TextBoxX_PatchFileCreate.WatermarkText = "No file loaded!" @@ -688,10 +711,16 @@ Partial Class Form1 Me.TextBoxX_OriginalLevelCreate.PreventEnterBeep = True Me.TextBoxX_OriginalLevelCreate.ReadOnly = True Me.TextBoxX_OriginalLevelCreate.Size = New System.Drawing.Size(215, 20) + Me.SuperTooltip1.SetSuperTooltip(Me.TextBoxX_OriginalLevelCreate, New DevComponents.DotNetBar.SuperTooltipInfo("", "", "Open the ""without feauture"" level here.", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.System, False, False, New System.Drawing.Size(0, 0))) Me.TextBoxX_OriginalLevelCreate.TabIndex = 21 Me.TextBoxX_OriginalLevelCreate.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty Me.TextBoxX_OriginalLevelCreate.WatermarkText = "No file loaded!" ' + 'SuperTooltip1 + ' + Me.SuperTooltip1.DefaultTooltipSettings = New DevComponents.DotNetBar.SuperTooltipInfo("", "", "", Nothing, Nothing, DevComponents.DotNetBar.eTooltipColor.Gray) + Me.SuperTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F" + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -755,4 +784,5 @@ Partial Class Form1 Friend WithEvents LabelX15 As DevComponents.DotNetBar.LabelX Friend WithEvents CircularProgress_Apply As DevComponents.DotNetBar.Controls.CircularProgress Friend WithEvents CircularProgress_Create As DevComponents.DotNetBar.Controls.CircularProgress + Friend WithEvents SuperTooltip1 As DevComponents.DotNetBar.SuperTooltip End Class diff --git a/SMBX Magic Patcher/Form1.resx b/SMBX Magic Patcher/Form1.resx index a0aa199..a1d8e4a 100644 --- a/SMBX Magic Patcher/Form1.resx +++ b/SMBX Magic Patcher/Form1.resx @@ -117,6 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + Use this, if you would make a patch of a little feauture wich is in a level of e.g. your episode. Then you should make a level "without feauture" and "with feauture". +That means that all things (like npc's or custom graphics), wich you used in this level will, be ignored. + diff --git a/SMBX Magic Patcher/Form1.vb b/SMBX Magic Patcher/Form1.vb index 33786f2..0396244 100644 --- a/SMBX Magic Patcher/Form1.vb +++ b/SMBX Magic Patcher/Form1.vb @@ -85,7 +85,7 @@ Public Class Form1 Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button_ApplyPatch.Click CircularProgress_Apply.IsRunning = True - LabelX14.Enabled = True + LabelX14.Visible = True Button_ApplyPatch.Enabled = True Select Case SMBXPFX.ApplyPatch(TextBoxX_OriginalLevelApply.Text, TextBoxX_PatchFileApply.Text) @@ -95,7 +95,7 @@ Public Class Form1 Case Else : MessageBoxEx.Show("Done", "There is an unknown error!", MessageBoxButtons.OK, MessageBoxIcon.Error) End Select - LabelX14.Enabled = False + LabelX14.Visible = False CircularProgress_Apply.IsRunning = False Button_ApplyPatch.Enabled = False End Sub @@ -122,7 +122,7 @@ Public Class SMBXPFX Shared Function CreatePatch(OriginalLevel As String, PatchedLevel As String, PatchFile As String, Optional UseCustomOriginalLevelFile As Boolean = False, Optional CopyBlocksEtc As Boolean = True, Optional CopyGraphics As Boolean = True, Optional CopyConfigurations As Boolean = True, Optional CopyEvents As Boolean = True, Optional CopyLayers As Boolean = True, Optional CopyVariables As Boolean = True, Optional CopyScripts As Boolean = True, Optional CopyLiquids As Boolean = True) As Integer Dim CheckIfFilesExists = True If Not UseCustomOriginalLevelFile Then - OriginalLevel = Application.StartupPath & "\emptylevel\emptylevel.dat" + OriginalLevel = Application.StartupPath & "\Data\emptylevel\emptylevel.dat" CheckIfFilesExists = False End If @@ -177,11 +177,11 @@ SkipCheck: End If If Directory.Exists(TempLeveldir) Then Directory.Delete(TempLeveldir, True) : Application.DoEvents() Directory.CreateDirectory(TempLeveldir) : Application.DoEvents() For Each f As String In FilesToCopyInLeveldir - Try : File.Copy(f, TempLeveldir & "\" & Path.GetFileName(f)) : Catch ex As Exception : MsgBox(ex.Message) : End Try + Try : File.Copy(f, TempLeveldir & "\" & Path.GetFileName(f)) : Catch ex As Exception : End Try Application.DoEvents() : Next If FilesToCopyInLevelfiledir.Count > 0 Then Directory.CreateDirectory(TempLevelfiledir) For Each f As String In FilesToCopyInLevelfiledir - Try : File.Copy(f, TempLevelfiledir & "\" & Path.GetFileName(f)) : Catch ex As Exception : MsgBox(ex.Message) : End Try + Try : File.Copy(f, TempLevelfiledir & "\" & Path.GetFileName(f)) : Catch ex As Exception : End Try Application.DoEvents() : Next 'Write level: @@ -191,8 +191,8 @@ SkipCheck: End If If File.Exists(PatchFile) Then File.Delete(PatchFile) Dim sevenzip As New Process If Environment.Is64BitOperatingSystem Then - sevenzip.StartInfo.FileName = Application.StartupPath & "\7-Zip\x64\7z.exe" - Else : sevenzip.StartInfo.FileName = Application.StartupPath & "\7-Zip\x86\7z.exe" + sevenzip.StartInfo.FileName = Application.StartupPath & "\Data\7-Zip\x64\7z.exe" + Else : sevenzip.StartInfo.FileName = Application.StartupPath & "\Data\7-Zip\x86\7z.exe" End If Dim password As String = "SMBXMagicPatcher" sevenzip.StartInfo.Arguments = String.Format("a -t7z ""{1}"" -p{0} -mhe -mx9 ""{2}""", password, Form1.TextBoxX_PatchFileCreate.Text, TempLeveldir & "\*") @@ -227,8 +227,8 @@ SkipCheck: End If If PatchTyp = 0 Then Dim sevenzip As New Process If Environment.Is64BitOperatingSystem Then - sevenzip.StartInfo.FileName = Application.StartupPath & "\7-Zip\x64\7z.exe" - Else : sevenzip.StartInfo.FileName = Application.StartupPath & "\7-Zip\x86\7z.exe" + sevenzip.StartInfo.FileName = Application.StartupPath & "\Data\7-Zip\x64\7z.exe" + Else : sevenzip.StartInfo.FileName = Application.StartupPath & "\Data\7-Zip\x86\7z.exe" End If Dim password As String = "SMBXMagicPatcher" sevenzip.StartInfo.Arguments = String.Format("x ""{1}"" -p{0} -o""{2}"" -r", password, Form1.TextBoxX_PatchFileApply.Text, TempLeveldir & "\") @@ -260,7 +260,7 @@ SkipCheck: End If If Not Directory.Exists(oLevelfiledir) And oListFilesInLevelfiledir.Count > 0 Then Directory.CreateDirectory(oLevelfiledir) For i As Integer = 0 To pListFilesInLeveldir.Count - 1 If Not pListFilesInLeveldir(i) = TempLeveldir & "\data.dat" Then - File.Copy(pListFilesInLeveldir(i), oLeveldir & "\" & Path.GetFileName(pListFilesInLeveldir(i)), True) : MsgBox("") : End If + File.Copy(pListFilesInLeveldir(i), oLeveldir & "\" & Path.GetFileName(pListFilesInLeveldir(i)), True) : End If Application.DoEvents() : Next For i As Integer = 0 To pListFilesInLevelfiledir.Count - 1 File.Copy(pListFilesInLevelfiledir(i), oLevelfiledir & "\" & Path.GetFileName(pListFilesInLevelfiledir(i)), True)