Updated my fork!

Conflicts:
	Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs

3 files changed, 11 insertions, 6 deletions

diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
index 54716e5..b988092 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -13,12 +13,11 @@ using Histacom2.Engine.Template;
 
 namespace Histacom2.OS.Win95.Win95Apps.Story
 {
-    static class Hack1 : Object
+    static class Hack1 : object
     {
         static WindowManager wm = new WindowManager();
         static bool ended = false;
         static Thread soundThread = new Thread(dialup_sound_play);
-        static bool devMode = true;
 
         // This is the very first story script!
         public static void StartObjective()
@@ -28,7 +27,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
                 tmr.Interval = 1;
                 tmr.Tick += new EventHandler(CheckIfSoundFinished);
 
-                if (devMode == true) ContinueObjective();
+                if (SaveSystem.DevMode) ContinueObjective();
                 else
                 {
                     soundThread.Start();
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
index 1dc99da..76b9baf 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
@@ -270,7 +270,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
             await Task.Delay(2000);
             sp.Stop();
 
-            SaveSystem.UpgradeFileSystem("95", "98");
+            SaveSystem.UpgradeFileSystem("98");
             SaveSystem.CurrentSave.CurrentOS = "98";
             SaveSystem.currentTheme = new Default98Theme();
             SaveSystem.CurrentSave.ThemeName = "default98";
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
index 9e0d2e5..e015eda 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
@@ -108,7 +108,7 @@
             // 
             // MenuStrip1
             // 
-            this.MenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
+            this.MenuStrip1.BackColor = System.Drawing.Color.Silver;
             this.MenuStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.MenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FileToolStripMenuItem,
@@ -139,7 +139,7 @@
             this.TextDocumentToolStripMenuItem,
             this.BitmapImageToolStripMenuItem});
             this.CreateShortcutToolStripMenuItem.Name = "CreateShortcutToolStripMenuItem";
-            this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
             this.CreateShortcutToolStripMenuItem.Text = "New";
             // 
             // FolderToolStripMenuItem
@@ -149,6 +149,12 @@
             this.FolderToolStripMenuItem.Text = "Folder";
             this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click);
             // 
+            // ShortcutToolStripMenuItem
+            // 
+            this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem";
+            this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.ShortcutToolStripMenuItem.Text = "Shortcut";
+            // 
             // TextDocumentToolStripMenuItem
             // 
             this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem";