Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

8 files changed, 55 insertions, 0 deletions

diff --git a/TimeHACK.Engine/Properties/Resources.Designer.cs b/TimeHACK.Engine/Properties/Resources.Designer.cs
index b0186e9..6801231 100644
--- a/TimeHACK.Engine/Properties/Resources.Designer.cs
+++ b/TimeHACK.Engine/Properties/Resources.Designer.cs
@@ -221,6 +221,34 @@ namespace TimeHACK.Engine.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
         /// </summary>
+        internal static System.IO.UnmanagedMemoryStream Win95PlusInsideComputerStart {
+            get {
+                return ResourceManager.GetStream("Win95PlusInsideComputerStart", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream Win95PlusInsideComputerStop {
+            get {
+                return ResourceManager.GetStream("Win95PlusInsideComputerStop", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Win95PlusInsideComputerWallpaper {
+            get {
+                object obj = ResourceManager.GetObject("Win95PlusInsideComputerWallpaper", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
         internal static System.IO.UnmanagedMemoryStream Win95Start {
             get {
                 return ResourceManager.GetStream("Win95Start", resourceCulture);
diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx
index aeb1500..08e94f6 100644
--- a/TimeHACK.Engine/Properties/Resources.resx
+++ b/TimeHACK.Engine/Properties/Resources.resx
@@ -199,4 +199,13 @@
   <data name="Win98Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Win98Stop.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Win95PlusInsideComputerStart" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win95PlusInsideComputerStart.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Win95PlusInsideComputerStop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win95PlusInsideComputerStop.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Win95PlusInsideComputerWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Win95PlusInsideComputerWallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav
new file mode 100644
index 0000000..22ca7df
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav
diff --git a/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav
new file mode 100644
index 0000000..d7a25a6
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav
diff --git a/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg b/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg
new file mode 100644
index 0000000..ae577da
--- /dev/null
+++ b/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg
diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index 5ea5831..cd8bb2f 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -231,6 +231,9 @@ namespace TimeHACK.Engine
                 case "dangeranimals":
                     currentTheme = new DangerousCreaturesTheme();
                     break;
+                case "insidepc":
+                    currentTheme = new InsideComputerTheme();
+                    break;
             }
         }
     }
diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs
index 804eb88..89c913d 100644
--- a/TimeHACK.Engine/Theme.cs
+++ b/TimeHACK.Engine/Theme.cs
@@ -51,4 +51,16 @@ namespace TimeHACK.Engine
             themeName = "dangeranimals";
         }
     }
+
+    public class InsideComputerTheme: Theme
+    {
+        public InsideComputerTheme()
+        {
+            startSound = Properties.Resources.Win95PlusInsideComputerStart;
+            stopSound = Properties.Resources.Win95PlusInsideComputerStop;
+
+            defaultWallpaper = Properties.Resources.Win95PlusInsideComputerWallpaper;
+            themeName = "insidepc";
+        }
+    }
 }
diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj
index 22e9038..695b2d8 100644
--- a/TimeHACK.Engine/TimeHACK.Engine.csproj
+++ b/TimeHACK.Engine/TimeHACK.Engine.csproj
@@ -118,6 +118,9 @@
     <None Include="Resources\Win98Start.wav" />
     <None Include="Resources\Win98Stop.WAV" />
     <None Include="Resources\Win95PlusDangerousCreaturesWallpaper.JPG" />
+    <None Include="Resources\Win95PlusInsideComputerWallpaper.jpg" />
+    <None Include="Resources\Win95PlusInsideComputerStop.wav" />
+    <None Include="Resources\Win95PlusInsideComputerStart.wav" />
     <Content Include="Resources\WinClassic\Window\BottomLeft.png" />
     <Content Include="Resources\WinClassic\Window\BottomRight.png" />
     <Content Include="Resources\WinClassic\Window\BottomSide.png" />