Theme sounds work!

6 files changed, 25 insertions, 3 deletions

diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index 7110995..5ea5831 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -220,6 +220,19 @@ namespace TimeHACK.Engine
             // CHANGE THE "JSON" TO "B64" ON A FINAL RELEASE!
             File.WriteAllText(Path.Combine(ProfileDirectory, ProfileFile), json);
         }
+
+        public static void SetTheme()
+        {
+            switch (CurrentSave.ThemeName)
+            {
+                case "default95":
+                    currentTheme = new Default95Theme();
+                    break;
+                case "dangeranimals":
+                    currentTheme = new DangerousCreaturesTheme();
+                    break;
+            }
+        }
     }
 
     public class Save
diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs
index cd82fac..804eb88 100644
--- a/TimeHACK.Engine/Theme.cs
+++ b/TimeHACK.Engine/Theme.cs
@@ -45,6 +45,7 @@ namespace TimeHACK.Engine
         public DangerousCreaturesTheme()
         {
             startSound = Properties.Resources.Win95PlusDangerousCreaturesStart;
+            stopSound = Properties.Resources.Win95PlusDangerousCreaturesStart;
 
             defaultWallpaper = Properties.Resources.Win95PlusDangerousCreaturesWallpaper;
             themeName = "dangeranimals";
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index d83d45e..c6db739 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -47,6 +47,7 @@ namespace TimeHACK.OS.Win95
             SettingsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             FindToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            BackgroundImage = currentTheme.defaultWallpaper;
             foreach (ToolStripMenuItem item in startmenuitems.Items)
             {
                 item.MouseEnter += new EventHandler(MenuItem_MouseEnter);
@@ -72,6 +73,7 @@ namespace TimeHACK.OS.Win95
         //  When New Game is clicked in TitleScreen.cs
         private void Desktop_Load(object sender, EventArgs e)
         {
+            if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, desktopicons.Width, desktopicons.Height);
             //Start Menu Color - Commented until it works reliably
             //startmenuitems.Renderer = new MyRenderer();
             //ProgramsToolStripMenuItem.DropDown.Renderer = new MyRenderer();
@@ -80,7 +82,7 @@ namespace TimeHACK.OS.Win95
             fontLoad();
             
             // Play Windows 95 Start Sound
-            Stream audio = Properties.Resources.Win95Start;
+            Stream audio = currentTheme.startSound;
             startsound = new SoundPlayer(audio);
             startsound.Play();
 
@@ -153,7 +155,8 @@ namespace TimeHACK.OS.Win95
         // Shutdown button
         private void ShutdownToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Program.ShutdownApplication(Properties.Resources.tada);
+            SaveGame();
+            Program.ShutdownApplication(currentTheme.stopSound);
         }
 
         #endregion //Region
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs
index e15bde5..984de72 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -57,10 +57,12 @@ namespace TimeHACK.OS.Win95.Win95Apps
             switch ((string)comboBox1.SelectedItem)
             {
                 case "Default":
+                    SaveSystem.CurrentSave.ThemeName = "default95";
                     SaveSystem.currentTheme = new Default95Theme();
                     TitleScreen.frm95.BackgroundImage = null;
                     break;
                 case "Dangerous Creatures":
+                    SaveSystem.CurrentSave.ThemeName = "dangeranimals";
                     SaveSystem.currentTheme = new DangerousCreaturesTheme();
                     TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG;
                     break;
@@ -72,11 +74,13 @@ namespace TimeHACK.OS.Win95.Win95Apps
             switch ((string)comboBox1.SelectedItem)
             {
                 case "Default":
+                    SaveSystem.CurrentSave.ThemeName = "default95";
                     SaveSystem.currentTheme = new Default95Theme();
                     TitleScreen.frm95.BackgroundImage = null;
                     TitleScreen.frm95.desktopicons.BackgroundImage = null;
                     break;
                 case "Dangerous Creatures":
+                    SaveSystem.CurrentSave.ThemeName = "dangeranimals";
                     SaveSystem.currentTheme = new DangerousCreaturesTheme();
                     TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG;
                     TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height);
diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs
index 5cc011a..e2a4be6 100644
--- a/TimeHACK.Main/Program.cs
+++ b/TimeHACK.Main/Program.cs
@@ -82,7 +82,7 @@ namespace TimeHACK
             }           
         }
 
-        public static void ShutdownApplication(System.IO.UnmanagedMemoryStream audio)
+        public static void ShutdownApplication(System.IO.Stream audio)
         {
             System.Threading.Thread.Sleep(500);
             System.IO.Stream audioPlay = audio;
diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs
index 6d11dc6..1b7d006 100644
--- a/TimeHACK.Main/TitleScreen.cs
+++ b/TimeHACK.Main/TitleScreen.cs
@@ -276,6 +276,7 @@ namespace TimeHACK
             if (loadGameBox.successful == true)
             {
                 LoadSave();
+                SetTheme();
                 StartGame();
             }            
         }