Fixed bugs

4 files changed, 22 insertions, 19 deletions

diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index 383a372..2a372e3 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -171,8 +171,8 @@ namespace TimeHACK.Engine
 
             SaveDirectoryInfo(ProfileFileSystemDirectory, false, "My Computer", false);            
             SaveDirectoryInfo(ProfileMyComputerDirectory, false, "Win95 (C:)", true);
-            if (CurrentSave.CurrentOS == "95") SaveDirectoryInfo(ProfileDocumentsDirectory, false, "My Documents", true);
-            if (CurrentSave.CurrentOS != "95") SaveDirectoryInfo(ProfileSettingsDirectory, false, "Documents and Settings", true);
+            if (CurrentSave.CurrentOS == "95" || CurrentSave.CurrentOS == "98") SaveDirectoryInfo(ProfileDocumentsDirectory, false, "My Documents", true);
+            if (CurrentSave.CurrentOS == "2000" || CurrentSave.CurrentOS == "ME") SaveDirectoryInfo(ProfileSettingsDirectory, false, "Documents and Settings", true);
             SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "Accessories"), false, "Accessories", true);            
             SaveDirectoryInfo(ProfileProgramsDirectory, true, "Program Files", true);
             SaveDirectoryInfo(ProfileWindowsDirectory, true, "Windows", true);
@@ -210,6 +210,12 @@ namespace TimeHACK.Engine
                         // All the above OSes share basically the same file layout!
                         // (Excluding Documents And Settings) which is 2000 and ME only
 
+                        // Rename the C Drive to Win98
+
+                        SaveDirectoryInfo(ProfileMyComputerDirectory, false, "Win98 (C:)", true);
+
+                        // Add Address Book into existance!
+
                         SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "Outlook Express"), false, "Outlook Express", true);
                         CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Outlook Express", "WAB.exe"), "addressbook");
                     }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index a685fa6..e85b39f 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -22,7 +22,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public string onlyViewExtension = "";
 
         string ToReplaceWith = ProfileDirectory;
-        string CurrentDirectory = Path.Combine(ProfileDirectory, "folders", "Computer");
+        string CurrentDirectory = ProfileMyComputerDirectory;
         string OldLabelText;
         int fileType = 6;
         //string attemptedDirectory = "";
diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs
index e3e7043..5585e7d 100644
--- a/TimeHACK.Main/OS/Win98/Win98.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.cs
@@ -71,6 +71,8 @@ namespace TimeHACK.OS.Win98
         //  When New Game is clicked in TitleScreen.cs
         private void Desktop_Load(object sender, EventArgs e)
         {
+            UpgradeFileSystem("95", "98");
+
             if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height);
             //Start Menu Color - Commented until it works reliably
             //startmenuitems.Renderer = new MyRenderer();
diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
index 3a87805..e97276d 100644
--- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
@@ -22,7 +22,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public string onlyViewExtension = "";
 
         string ToReplaceWith = ProfileDirectory;
-        string CurrentDirectory = Path.Combine(ProfileDirectory, "folders", "Computer");
+        string CurrentDirectory = ProfileMyComputerDirectory;
         string OldLabelText;
         int fileType = 6;
         //string attemptedDirectory = "";
@@ -162,23 +162,18 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
                 // Update the WebView
 
-                if (Directory.Exists(CurrentDirectory))
+                if (CurrentDirectory == SaveSystem.ProfileMyComputerDirectory)
                 {
-                    if (CurrentDirectory == SaveSystem.ProfileMyComputerDirectory)
-                    {
-                        pictureBox1.Image = Properties.Resources.Win95HardDiskIcon;
-                    } else if (CurrentDirectory == SaveSystem.ProfileFileSystemDirectory) {
-                        pictureBox1.Image = Properties.Resources.Win95Computer;
-                    } else {
-                        pictureBox1.Image = Properties.Resources.WinClassicFolder;
-                    }
-                    
+                    pictureBox1.Image = Properties.Resources.Win95HardDiskIcon;
+                } else if (CurrentDirectory == SaveSystem.ProfileFileSystemDirectory) {
+                    pictureBox1.Image = Properties.Resources.Win95Computer;
                 } else {
-                    // If it is the drive give it that icon
-
-                    
+                    pictureBox1.Image = Properties.Resources.WinClassicFolder;
                 }
 
+                txtInfoTip.Show();
+                InfoDesc.Hide();
+
                 string weblabel = ReadDataFile(CurrentDirectory, false);
 
                 txtInfoTitle.Text = weblabel ?? new FileInfo(CurrentDirectory).Name;
@@ -621,7 +616,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                         }
                         else
                         {
-                            OpenFile((string)mainView.FocusedItem.Tag);
+                            OpenFile(mainView.FocusedItem.Tag.ToString());
                         }
                 }
             } catch (Exception ex) {
@@ -756,7 +751,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         private void AboutWindows95ToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WindowManager wm = new WindowManager();
-            wm.StartAboutBox95("Windows 95", "Microsoft Windows 98", Properties.Resources.WinClassicAbout95);
+            wm.StartAboutBox95("Windows 98", "Microsoft Windows 98", Properties.Resources.WinClassicAbout95);
         }
 
         private void RenameToolStripMenuItem_Click(object sender, EventArgs e)