diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-04-29 13:29:59 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-29 13:29:59 +0100 |
| commit | 0fd0391263ccac953fca43d5476410f4584446eb (patch) | |
| tree | 5577d2d1c42d2243341034c6a1536f225fc6655b /TimeHACK.Engine | |
| parent | 2c5d04a7708f5edd6d792c6938867a558cb955f8 (diff) | |
| parent | a6bece6c3b5b8fc3c9cd17ae2cbe135e2025ab44 (diff) | |
| download | histacom2-0fd0391263ccac953fca43d5476410f4584446eb.tar.gz histacom2-0fd0391263ccac953fca43d5476410f4584446eb.tar.bz2 histacom2-0fd0391263ccac953fca43d5476410f4584446eb.zip | |
Merge branch 'master' into master
Diffstat (limited to 'TimeHACK.Engine')
14 files changed, 17 insertions, 1 deletions
diff --git a/TimeHACK.Engine/Properties/Resources.Designer.cs b/TimeHACK.Engine/Properties/Resources.Designer.cs index 4fc5367..0153858 100644 --- a/TimeHACK.Engine/Properties/Resources.Designer.cs +++ b/TimeHACK.Engine/Properties/Resources.Designer.cs @@ -91,6 +91,15 @@ 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 CHORD { + get { + return ResourceManager.GetStream("CHORD", resourceCulture); + } + } + + /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> internal static System.Drawing.Bitmap LeftSide { diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx index 299d056..ce1326d 100644 --- a/TimeHACK.Engine/Properties/Resources.resx +++ b/TimeHACK.Engine/Properties/Resources.resx @@ -178,4 +178,7 @@ <data name="windows_command_prompt" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\WinClassic\Window\windows_command_prompt.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name="CHORD" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\resources\chord.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> </root>
\ No newline at end of file diff --git a/TimeHACK.Engine/Resources/CHORD.WAV b/TimeHACK.Engine/Resources/CHORD.WAV Binary files differnew file mode 100644 index 0000000..fd2b30b --- /dev/null +++ b/TimeHACK.Engine/Resources/CHORD.WAV diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index c9c9c1b..8f536ca 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -99,6 +99,7 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> + <Content Include="Resources\CHORD.WAV" /> <Content Include="Resources\Icon128x.ico" /> <None Include="Resources\WinAboutSeparator95.png" /> <Content Include="Resources\WinClassic\Window\BottomLeft.png" /> diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index 7a45011..0ba5d99 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -2,6 +2,7 @@ using System.Windows.Forms; using System.Drawing; using TimeHACK.Engine.Template; +using System.Media; namespace TimeHACK.Engine { @@ -63,6 +64,8 @@ namespace TimeHACK.Engine { Infobox95 app = new Infobox95(); app.infoText.Text = text; + SoundPlayer sp = new SoundPlayer(Properties.Resources.CHORD); + sp.Play(); return startWin95(app, title, null, false, false); } diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll Binary files differindex 8af251f..7abf3fb 100644 --- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb Binary files differindex 432a796..eca10d6 100644 --- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb diff --git a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache index 0fc4a9a..60cda70 100644 --- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -c069a0dc9ee2cef4a9280ad4bae0f080a7205bc1 +43714715dce48cadac96289cc40b0a19287b0183 diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 211aeef..779326e 100644 --- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll Binary files differindex 5de7cbf..86eea76 100644 --- a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll +++ b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources Binary files differindex 1e84bb7..999bbc4 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache Binary files differindex 4141ba7..acc5fc3 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll Binary files differindex 8af251f..7abf3fb 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb Binary files differindex 432a796..eca10d6 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb |
