diff --git a/Images/shot2.png b/Images/shot2.png new file mode 100644 index 0000000..d6ff316 Binary files /dev/null and b/Images/shot2.png differ diff --git a/Images/shot3.png b/Images/shot3.png new file mode 100644 index 0000000..0d55beb Binary files /dev/null and b/Images/shot3.png differ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..b73b015 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Media Explorer + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/NScummUWP.sln b/NScummUWP.sln index fe6ba7c..203ca61 100644 --- a/NScummUWP.sln +++ b/NScummUWP.sln @@ -4,20 +4,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 17.6.33513.286 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.UWP", "NScumm.UWP\NScumm.UWP.csproj", "{74ED9AF5-716F-48A7-97A5-FCDB51C6F950}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.UWP", "Src\NScumm.UWP\NScumm.UWP.csproj", "{74ED9AF5-716F-48A7-97A5-FCDB51C6F950}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Core", "NScumm.Core\NScumm.Core.csproj", "{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Core", "Src\NScumm.Core\NScumm.Core.csproj", "{8E7A9E5B-D7EB-4DA1-8EE7-A5D8DE202372}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Platform_UWP", "NScumm.Platform_UWP\NScumm.Platform_UWP.csproj", "{F8002A61-23CF-4B47-9561-830F18AFF6F1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Platform_UWP", "Src\NScumm.Platform_UWP\NScumm.Platform_UWP.csproj", "{F8002A61-23CF-4B47-9561-830F18AFF6F1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Scumm", "NScumm.Scumm\NScumm.Scumm.csproj", "{97342112-448A-4636-827F-8D47B226D86F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Scumm", "Src\NScumm.Scumm\NScumm.Scumm.csproj", "{97342112-448A-4636-827F-8D47B226D86F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sky", "NScumm.Sky\NScumm.Sky.csproj", "{8740A0CD-2613-4354-9506-35035A735962}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sky", "Src\NScumm.Sky\NScumm.Sky.csproj", "{8740A0CD-2613-4354-9506-35035A735962}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sword1", "NScumm.Sword1\NScumm.Sword1.csproj", "{EF539A3F-0672-412C-B9D0-38DCD3622D99}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NScumm.Sword1", "Src\NScumm.Sword1\NScumm.Sword1.csproj", "{EF539A3F-0672-412C-B9D0-38DCD3622D99}" EndProject Global diff --git a/README.md b/README.md index 6f0c192..1b4f748 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# NScummUWP v1.2.1 +# NScummUWP v1.2.2 The SCUMM UWP client for the Windows 10 (Mobile) platform. :) ## my 2 cents @@ -6,10 +6,12 @@ The SCUMM UWP client for the Windows 10 (Mobile) platform. :) 2. RnD nSCUMMUWP by Bashar Astifan (https://github.com/basharast/NScummUWP) 3. nSCUMM "refubrishing" (SceminoNSCUMM+NSCUMMUWP synthez...) 4. Some "project optimization" applied (reducing srccode's filesize from 166mb to 32mb) +5. ru_RU local. added ## Screenshots / Images -![screenshot](https://github.com/mediaexplorer74/nscumm/blob/master/Images/shot1.png) -![demo reel](https://github.com/mediaexplorer74/nscumm/blob/master/Images/nscumm.png) +![W10 Desktop](https://github.com/mediaexplorer74/nscumm/blob/master/Images/shot1.png) +![W10M 15252 on L950](https://github.com/mediaexplorer74/nscumm/blob/master/Images/shot2.png) +![W10M Astoria on L640DS](https://github.com/mediaexplorer74/nscumm/blob/master/Images/shot3.png) ## Build instructions 1. First, check that you have the [necessary tools](#requirements) installed. diff --git a/Clean-Bin-Obj-Folders.cmd b/Src/Clean-Bin-Obj-Folders.cmd similarity index 100% rename from Clean-Bin-Obj-Folders.cmd rename to Src/Clean-Bin-Obj-Folders.cmd diff --git a/NScumm.Core/Audio/AudioFormat.cs b/Src/NScumm.Core/Audio/AudioFormat.cs similarity index 100% rename from NScumm.Core/Audio/AudioFormat.cs rename to Src/NScumm.Core/Audio/AudioFormat.cs diff --git a/NScumm.Core/Audio/CMSMusicPlugin.cs b/Src/NScumm.Core/Audio/CMSMusicPlugin.cs similarity index 100% rename from NScumm.Core/Audio/CMSMusicPlugin.cs rename to Src/NScumm.Core/Audio/CMSMusicPlugin.cs diff --git a/NScumm.Core/Audio/Channel.cs b/Src/NScumm.Core/Audio/Channel.cs similarity index 100% rename from NScumm.Core/Audio/Channel.cs rename to Src/NScumm.Core/Audio/Channel.cs diff --git a/NScumm.Core/Audio/Decoders/AudioStreamHelper.cs b/Src/NScumm.Core/Audio/Decoders/AudioStreamHelper.cs similarity index 100% rename from NScumm.Core/Audio/Decoders/AudioStreamHelper.cs rename to Src/NScumm.Core/Audio/Decoders/AudioStreamHelper.cs diff --git a/NScumm.Core/Audio/Decoders/Ima_ADPCMStream.cs b/Src/NScumm.Core/Audio/Decoders/Ima_ADPCMStream.cs similarity index 100% rename from NScumm.Core/Audio/Decoders/Ima_ADPCMStream.cs rename to Src/NScumm.Core/Audio/Decoders/Ima_ADPCMStream.cs diff --git a/NScumm.Core/Audio/Decoders/RawStream.cs b/Src/NScumm.Core/Audio/Decoders/RawStream.cs similarity index 100% rename from NScumm.Core/Audio/Decoders/RawStream.cs rename to Src/NScumm.Core/Audio/Decoders/RawStream.cs diff --git a/NScumm.Core/Audio/Decoders/SubLoopingAudioStream.cs b/Src/NScumm.Core/Audio/Decoders/SubLoopingAudioStream.cs similarity index 100% rename from NScumm.Core/Audio/Decoders/SubLoopingAudioStream.cs rename to Src/NScumm.Core/Audio/Decoders/SubLoopingAudioStream.cs diff --git a/NScumm.Core/Audio/Decoders/VocStream.cs b/Src/NScumm.Core/Audio/Decoders/VocStream.cs similarity index 100% rename from NScumm.Core/Audio/Decoders/VocStream.cs rename to Src/NScumm.Core/Audio/Decoders/VocStream.cs diff --git a/NScumm.Core/Audio/Decoders/XAStream.cs b/Src/NScumm.Core/Audio/Decoders/XAStream.cs similarity index 100% rename from NScumm.Core/Audio/Decoders/XAStream.cs rename to Src/NScumm.Core/Audio/Decoders/XAStream.cs diff --git a/NScumm.Core/Audio/DeviceHandle.cs b/Src/NScumm.Core/Audio/DeviceHandle.cs similarity index 100% rename from NScumm.Core/Audio/DeviceHandle.cs rename to Src/NScumm.Core/Audio/DeviceHandle.cs diff --git a/NScumm.Core/Audio/FixedPointFractionHelper.cs b/Src/NScumm.Core/Audio/FixedPointFractionHelper.cs similarity index 100% rename from NScumm.Core/Audio/FixedPointFractionHelper.cs rename to Src/NScumm.Core/Audio/FixedPointFractionHelper.cs diff --git a/NScumm.Core/Audio/IAudioCDManager.cs b/Src/NScumm.Core/Audio/IAudioCDManager.cs similarity index 100% rename from NScumm.Core/Audio/IAudioCDManager.cs rename to Src/NScumm.Core/Audio/IAudioCDManager.cs diff --git a/NScumm.Core/Audio/IAudioOutput.cs b/Src/NScumm.Core/Audio/IAudioOutput.cs similarity index 100% rename from NScumm.Core/Audio/IAudioOutput.cs rename to Src/NScumm.Core/Audio/IAudioOutput.cs diff --git a/NScumm.Core/Audio/IAudioStream.cs b/Src/NScumm.Core/Audio/IAudioStream.cs similarity index 100% rename from NScumm.Core/Audio/IAudioStream.cs rename to Src/NScumm.Core/Audio/IAudioStream.cs diff --git a/NScumm.Core/Audio/IMixer.cs b/Src/NScumm.Core/Audio/IMixer.cs similarity index 100% rename from NScumm.Core/Audio/IMixer.cs rename to Src/NScumm.Core/Audio/IMixer.cs diff --git a/NScumm.Core/Audio/IMusicPluginObject.cs b/Src/NScumm.Core/Audio/IMusicPluginObject.cs similarity index 100% rename from NScumm.Core/Audio/IMusicPluginObject.cs rename to Src/NScumm.Core/Audio/IMusicPluginObject.cs diff --git a/NScumm.Core/Audio/ISoundRepository.cs b/Src/NScumm.Core/Audio/ISoundRepository.cs similarity index 100% rename from NScumm.Core/Audio/ISoundRepository.cs rename to Src/NScumm.Core/Audio/ISoundRepository.cs diff --git a/NScumm.Core/Audio/LoopingAudioStream.cs b/Src/NScumm.Core/Audio/LoopingAudioStream.cs similarity index 100% rename from NScumm.Core/Audio/LoopingAudioStream.cs rename to Src/NScumm.Core/Audio/LoopingAudioStream.cs diff --git a/NScumm.Core/Audio/Midi/IMidiDriver.cs b/Src/NScumm.Core/Audio/Midi/IMidiDriver.cs similarity index 100% rename from NScumm.Core/Audio/Midi/IMidiDriver.cs rename to Src/NScumm.Core/Audio/Midi/IMidiDriver.cs diff --git a/NScumm.Core/Audio/Midi/MidiParser.cs b/Src/NScumm.Core/Audio/Midi/MidiParser.cs similarity index 100% rename from NScumm.Core/Audio/Midi/MidiParser.cs rename to Src/NScumm.Core/Audio/Midi/MidiParser.cs diff --git a/NScumm.Core/Audio/Midi/NoteTimer.cs b/Src/NScumm.Core/Audio/Midi/NoteTimer.cs similarity index 100% rename from NScumm.Core/Audio/Midi/NoteTimer.cs rename to Src/NScumm.Core/Audio/Midi/NoteTimer.cs diff --git a/NScumm.Core/Audio/Midi/SmfMidiParser.cs b/Src/NScumm.Core/Audio/Midi/SmfMidiParser.cs similarity index 100% rename from NScumm.Core/Audio/Midi/SmfMidiParser.cs rename to Src/NScumm.Core/Audio/Midi/SmfMidiParser.cs diff --git a/NScumm.Core/Audio/Midi/Tracker.cs b/Src/NScumm.Core/Audio/Midi/Tracker.cs similarity index 100% rename from NScumm.Core/Audio/Midi/Tracker.cs rename to Src/NScumm.Core/Audio/Midi/Tracker.cs diff --git a/NScumm.Core/Audio/MidiChannel.cs b/Src/NScumm.Core/Audio/MidiChannel.cs similarity index 100% rename from NScumm.Core/Audio/MidiChannel.cs rename to Src/NScumm.Core/Audio/MidiChannel.cs diff --git a/NScumm.Core/Audio/MidiDriver.cs b/Src/NScumm.Core/Audio/MidiDriver.cs similarity index 100% rename from NScumm.Core/Audio/MidiDriver.cs rename to Src/NScumm.Core/Audio/MidiDriver.cs diff --git a/NScumm.Core/Audio/Mixer.cs b/Src/NScumm.Core/Audio/Mixer.cs similarity index 100% rename from NScumm.Core/Audio/Mixer.cs rename to Src/NScumm.Core/Audio/Mixer.cs diff --git a/NScumm.Core/Audio/Mods/Paula.cs b/Src/NScumm.Core/Audio/Mods/Paula.cs similarity index 100% rename from NScumm.Core/Audio/Mods/Paula.cs rename to Src/NScumm.Core/Audio/Mods/Paula.cs diff --git a/NScumm.Core/Audio/Mods/Tfmx.cs b/Src/NScumm.Core/Audio/Mods/Tfmx.cs similarity index 100% rename from NScumm.Core/Audio/Mods/Tfmx.cs rename to Src/NScumm.Core/Audio/Mods/Tfmx.cs diff --git a/NScumm.Core/Audio/MusicDevice.cs b/Src/NScumm.Core/Audio/MusicDevice.cs similarity index 100% rename from NScumm.Core/Audio/MusicDevice.cs rename to Src/NScumm.Core/Audio/MusicDevice.cs diff --git a/NScumm.Core/Audio/MusicManager.cs b/Src/NScumm.Core/Audio/MusicManager.cs similarity index 100% rename from NScumm.Core/Audio/MusicManager.cs rename to Src/NScumm.Core/Audio/MusicManager.cs diff --git a/NScumm.Core/Audio/MusicPluginObject.cs b/Src/NScumm.Core/Audio/MusicPluginObject.cs similarity index 100% rename from NScumm.Core/Audio/MusicPluginObject.cs rename to Src/NScumm.Core/Audio/MusicPluginObject.cs diff --git a/NScumm.Core/Audio/NullMidiDriver.cs b/Src/NScumm.Core/Audio/NullMidiDriver.cs similarity index 100% rename from NScumm.Core/Audio/NullMidiDriver.cs rename to Src/NScumm.Core/Audio/NullMidiDriver.cs diff --git a/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL.cs b/Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL.cs similarity index 100% rename from NScumm.Core/Audio/OPL/DosBox/DosBoxOPL.cs rename to Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL.cs diff --git a/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Channel.cs b/Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Channel.cs similarity index 100% rename from NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Channel.cs rename to Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Channel.cs diff --git a/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Chip.cs b/Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Chip.cs similarity index 100% rename from NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Chip.cs rename to Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Chip.cs diff --git a/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Operator.cs b/Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Operator.cs similarity index 100% rename from NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Operator.cs rename to Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Operator.cs diff --git a/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Shared.cs b/Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Shared.cs similarity index 100% rename from NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Shared.cs rename to Src/NScumm.Core/Audio/OPL/DosBox/DosBoxOPL_Shared.cs diff --git a/NScumm.Core/Audio/OPL/DosBox/OplChip.cs b/Src/NScumm.Core/Audio/OPL/DosBox/OplChip.cs similarity index 100% rename from NScumm.Core/Audio/OPL/DosBox/OplChip.cs rename to Src/NScumm.Core/Audio/OPL/DosBox/OplChip.cs diff --git a/NScumm.Core/Audio/OPL/DosBox/OplTimer.cs b/Src/NScumm.Core/Audio/OPL/DosBox/OplTimer.cs similarity index 100% rename from NScumm.Core/Audio/OPL/DosBox/OplTimer.cs rename to Src/NScumm.Core/Audio/OPL/DosBox/OplTimer.cs diff --git a/NScumm.Core/Audio/OPL/IOpl.cs b/Src/NScumm.Core/Audio/OPL/IOpl.cs similarity index 100% rename from NScumm.Core/Audio/OPL/IOpl.cs rename to Src/NScumm.Core/Audio/OPL/IOpl.cs diff --git a/NScumm.Core/Audio/OPL/Mame/FmOPL.cs b/Src/NScumm.Core/Audio/OPL/Mame/FmOPL.cs similarity index 100% rename from NScumm.Core/Audio/OPL/Mame/FmOPL.cs rename to Src/NScumm.Core/Audio/OPL/Mame/FmOPL.cs diff --git a/NScumm.Core/Audio/OPL/Mame/MameOPL.cs b/Src/NScumm.Core/Audio/OPL/Mame/MameOPL.cs similarity index 100% rename from NScumm.Core/Audio/OPL/Mame/MameOPL.cs rename to Src/NScumm.Core/Audio/OPL/Mame/MameOPL.cs diff --git a/NScumm.Core/Audio/PCJuniorMusicPlugin.cs b/Src/NScumm.Core/Audio/PCJuniorMusicPlugin.cs similarity index 100% rename from NScumm.Core/Audio/PCJuniorMusicPlugin.cs rename to Src/NScumm.Core/Audio/PCJuniorMusicPlugin.cs diff --git a/NScumm.Core/Audio/PCSpeaker.cs b/Src/NScumm.Core/Audio/PCSpeaker.cs similarity index 100% rename from NScumm.Core/Audio/PCSpeaker.cs rename to Src/NScumm.Core/Audio/PCSpeaker.cs diff --git a/NScumm.Core/Audio/PCSpeakerDriver.cs b/Src/NScumm.Core/Audio/PCSpeakerDriver.cs similarity index 100% rename from NScumm.Core/Audio/PCSpeakerDriver.cs rename to Src/NScumm.Core/Audio/PCSpeakerDriver.cs diff --git a/NScumm.Core/Audio/PCSpeakerMusicPlugin.cs b/Src/NScumm.Core/Audio/PCSpeakerMusicPlugin.cs similarity index 100% rename from NScumm.Core/Audio/PCSpeakerMusicPlugin.cs rename to Src/NScumm.Core/Audio/PCSpeakerMusicPlugin.cs diff --git a/NScumm.Core/Audio/QueuingAudioStream.cs b/Src/NScumm.Core/Audio/QueuingAudioStream.cs similarity index 100% rename from NScumm.Core/Audio/QueuingAudioStream.cs rename to Src/NScumm.Core/Audio/QueuingAudioStream.cs diff --git a/NScumm.Core/Audio/RateConverters/CopyRateConverter.cs b/Src/NScumm.Core/Audio/RateConverters/CopyRateConverter.cs similarity index 100% rename from NScumm.Core/Audio/RateConverters/CopyRateConverter.cs rename to Src/NScumm.Core/Audio/RateConverters/CopyRateConverter.cs diff --git a/NScumm.Core/Audio/RateConverters/IRateConverter.cs b/Src/NScumm.Core/Audio/RateConverters/IRateConverter.cs similarity index 100% rename from NScumm.Core/Audio/RateConverters/IRateConverter.cs rename to Src/NScumm.Core/Audio/RateConverters/IRateConverter.cs diff --git a/NScumm.Core/Audio/RateConverters/LinearRateConverter.cs b/Src/NScumm.Core/Audio/RateConverters/LinearRateConverter.cs similarity index 100% rename from NScumm.Core/Audio/RateConverters/LinearRateConverter.cs rename to Src/NScumm.Core/Audio/RateConverters/LinearRateConverter.cs diff --git a/NScumm.Core/Audio/RateConverters/RateHelper.cs b/Src/NScumm.Core/Audio/RateConverters/RateHelper.cs similarity index 100% rename from NScumm.Core/Audio/RateConverters/RateHelper.cs rename to Src/NScumm.Core/Audio/RateConverters/RateHelper.cs diff --git a/NScumm.Core/Audio/RateConverters/SimpleRateConverter.cs b/Src/NScumm.Core/Audio/RateConverters/SimpleRateConverter.cs similarity index 100% rename from NScumm.Core/Audio/RateConverters/SimpleRateConverter.cs rename to Src/NScumm.Core/Audio/RateConverters/SimpleRateConverter.cs diff --git a/NScumm.Core/Audio/SampleProviders/AudioSampleProvider16.cs b/Src/NScumm.Core/Audio/SampleProviders/AudioSampleProvider16.cs similarity index 100% rename from NScumm.Core/Audio/SampleProviders/AudioSampleProvider16.cs rename to Src/NScumm.Core/Audio/SampleProviders/AudioSampleProvider16.cs diff --git a/NScumm.Core/Audio/SampleProviders/AudioSampleProviderToAudioStream.cs b/Src/NScumm.Core/Audio/SampleProviders/AudioSampleProviderToAudioStream.cs similarity index 100% rename from NScumm.Core/Audio/SampleProviders/AudioSampleProviderToAudioStream.cs rename to Src/NScumm.Core/Audio/SampleProviders/AudioSampleProviderToAudioStream.cs diff --git a/NScumm.Core/Audio/SampleProviders/AudioStreamToAudioSampleProvider.cs b/Src/NScumm.Core/Audio/SampleProviders/AudioStreamToAudioSampleProvider.cs similarity index 100% rename from NScumm.Core/Audio/SampleProviders/AudioStreamToAudioSampleProvider.cs rename to Src/NScumm.Core/Audio/SampleProviders/AudioStreamToAudioSampleProvider.cs diff --git a/NScumm.Core/Audio/SampleProviders/IAudioSampleProvider.cs b/Src/NScumm.Core/Audio/SampleProviders/IAudioSampleProvider.cs similarity index 100% rename from NScumm.Core/Audio/SampleProviders/IAudioSampleProvider.cs rename to Src/NScumm.Core/Audio/SampleProviders/IAudioSampleProvider.cs diff --git a/NScumm.Core/Audio/SampleProviders/MonoToStereoAudioSampleProvider16.cs b/Src/NScumm.Core/Audio/SampleProviders/MonoToStereoAudioSampleProvider16.cs similarity index 100% rename from NScumm.Core/Audio/SampleProviders/MonoToStereoAudioSampleProvider16.cs rename to Src/NScumm.Core/Audio/SampleProviders/MonoToStereoAudioSampleProvider16.cs diff --git a/NScumm.Core/Audio/SampleProviders/ResampleAudioSampleProvider.cs b/Src/NScumm.Core/Audio/SampleProviders/ResampleAudioSampleProvider.cs similarity index 100% rename from NScumm.Core/Audio/SampleProviders/ResampleAudioSampleProvider.cs rename to Src/NScumm.Core/Audio/SampleProviders/ResampleAudioSampleProvider.cs diff --git a/NScumm.Core/Audio/SoftSynth/Adlib.cs b/Src/NScumm.Core/Audio/SoftSynth/Adlib.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/Adlib.cs rename to Src/NScumm.Core/Audio/SoftSynth/Adlib.cs diff --git a/NScumm.Core/Audio/SoftSynth/AdlibMidiDriver.cs b/Src/NScumm.Core/Audio/SoftSynth/AdlibMidiDriver.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/AdlibMidiDriver.cs rename to Src/NScumm.Core/Audio/SoftSynth/AdlibMidiDriver.cs diff --git a/NScumm.Core/Audio/SoftSynth/AdlibMidiDriver_Data.cs b/Src/NScumm.Core/Audio/SoftSynth/AdlibMidiDriver_Data.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/AdlibMidiDriver_Data.cs rename to Src/NScumm.Core/Audio/SoftSynth/AdlibMidiDriver_Data.cs diff --git a/NScumm.Core/Audio/SoftSynth/CMSEmulator.cs b/Src/NScumm.Core/Audio/SoftSynth/CMSEmulator.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/CMSEmulator.cs rename to Src/NScumm.Core/Audio/SoftSynth/CMSEmulator.cs diff --git a/NScumm.Core/Audio/SoftSynth/EmulatedMidiDriver.cs b/Src/NScumm.Core/Audio/SoftSynth/EmulatedMidiDriver.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/EmulatedMidiDriver.cs rename to Src/NScumm.Core/Audio/SoftSynth/EmulatedMidiDriver.cs diff --git a/NScumm.Core/Audio/SoftSynth/EnvelopeGenerator.cs b/Src/NScumm.Core/Audio/SoftSynth/EnvelopeGenerator.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/EnvelopeGenerator.cs rename to Src/NScumm.Core/Audio/SoftSynth/EnvelopeGenerator.cs diff --git a/NScumm.Core/Audio/SoftSynth/ExternalFilter.cs b/Src/NScumm.Core/Audio/SoftSynth/ExternalFilter.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/ExternalFilter.cs rename to Src/NScumm.Core/Audio/SoftSynth/ExternalFilter.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/ITownsAudioInterfacePluginDriver.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/ITownsAudioInterfacePluginDriver.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/ITownsAudioInterfacePluginDriver.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/ITownsAudioInterfacePluginDriver.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/MidiDriver_TOWNS.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/MidiDriver_TOWNS.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/MidiDriver_TOWNS.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/MidiDriver_TOWNS.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudioInterface.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudioInterface.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudioInterface.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudioInterface.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudioInterfaceInternal.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudioInterfaceInternal.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudioInterfaceInternal.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudioInterfaceInternal.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudio_PcmChannel.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudio_PcmChannel.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudio_PcmChannel.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudio_PcmChannel.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudio_WaveTable.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudio_WaveTable.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudio_WaveTable.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsAudio_WaveTable.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsEmuMusicPlugin.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsEmuMusicPlugin.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsEmuMusicPlugin.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsEmuMusicPlugin.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsEuphonyDriver.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsEuphonyDriver.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsEuphonyDriver.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsEuphonyDriver.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsMidiInputChannel.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsMidiInputChannel.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsMidiInputChannel.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsMidiInputChannel.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsMidiOutputChannel.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsMidiOutputChannel.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsMidiOutputChannel.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsMidiOutputChannel.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynth.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynth.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynth.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynth.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthOperator.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthOperator.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthOperator.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthOperator.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthPercussionSource.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthPercussionSource.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthPercussionSource.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthPercussionSource.cs diff --git a/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthSquareSineSource.cs b/Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthSquareSineSource.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthSquareSineSource.cs rename to Src/NScumm.Core/Audio/SoftSynth/FMTownsPc98/TownsPC98_FmSynthSquareSineSource.cs diff --git a/NScumm.Core/Audio/SoftSynth/Filter.cs b/Src/NScumm.Core/Audio/SoftSynth/Filter.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/Filter.cs rename to Src/NScumm.Core/Audio/SoftSynth/Filter.cs diff --git a/NScumm.Core/Audio/SoftSynth/ISid.cs b/Src/NScumm.Core/Audio/SoftSynth/ISid.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/ISid.cs rename to Src/NScumm.Core/Audio/SoftSynth/ISid.cs diff --git a/NScumm.Core/Audio/SoftSynth/Sid.cs b/Src/NScumm.Core/Audio/SoftSynth/Sid.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/Sid.cs rename to Src/NScumm.Core/Audio/SoftSynth/Sid.cs diff --git a/NScumm.Core/Audio/SoftSynth/Voice.cs b/Src/NScumm.Core/Audio/SoftSynth/Voice.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/Voice.cs rename to Src/NScumm.Core/Audio/SoftSynth/Voice.cs diff --git a/NScumm.Core/Audio/SoftSynth/WaveformGenerator.cs b/Src/NScumm.Core/Audio/SoftSynth/WaveformGenerator.cs similarity index 100% rename from NScumm.Core/Audio/SoftSynth/WaveformGenerator.cs rename to Src/NScumm.Core/Audio/SoftSynth/WaveformGenerator.cs diff --git a/NScumm.Core/Audio/SoundHandle.cs b/Src/NScumm.Core/Audio/SoundHandle.cs similarity index 100% rename from NScumm.Core/Audio/SoundHandle.cs rename to Src/NScumm.Core/Audio/SoundHandle.cs diff --git a/NScumm.Core/Audio/SubSeekableAudioStream.cs b/Src/NScumm.Core/Audio/SubSeekableAudioStream.cs similarity index 100% rename from NScumm.Core/Audio/SubSeekableAudioStream.cs rename to Src/NScumm.Core/Audio/SubSeekableAudioStream.cs diff --git a/NScumm.Core/Audio/Timestamp.cs b/Src/NScumm.Core/Audio/Timestamp.cs similarity index 100% rename from NScumm.Core/Audio/Timestamp.cs rename to Src/NScumm.Core/Audio/Timestamp.cs diff --git a/NScumm.Core/Audio/WaveStreamWriter.cs b/Src/NScumm.Core/Audio/WaveStreamWriter.cs similarity index 100% rename from NScumm.Core/Audio/WaveStreamWriter.cs rename to Src/NScumm.Core/Audio/WaveStreamWriter.cs diff --git a/NScumm.Core/BitStream.cs b/Src/NScumm.Core/BitStream.cs similarity index 100% rename from NScumm.Core/BitStream.cs rename to Src/NScumm.Core/BitStream.cs diff --git a/NScumm.Core/Common/Huffman.cs b/Src/NScumm.Core/Common/Huffman.cs similarity index 100% rename from NScumm.Core/Common/Huffman.cs rename to Src/NScumm.Core/Common/Huffman.cs diff --git a/NScumm.Core/Graphics/Color.cs b/Src/NScumm.Core/Graphics/Color.cs similarity index 100% rename from NScumm.Core/Graphics/Color.cs rename to Src/NScumm.Core/Graphics/Color.cs diff --git a/NScumm.Core/Graphics/IGraphicsManager.cs b/Src/NScumm.Core/Graphics/IGraphicsManager.cs similarity index 100% rename from NScumm.Core/Graphics/IGraphicsManager.cs rename to Src/NScumm.Core/Graphics/IGraphicsManager.cs diff --git a/NScumm.Core/Graphics/Point.cs b/Src/NScumm.Core/Graphics/Point.cs similarity index 100% rename from NScumm.Core/Graphics/Point.cs rename to Src/NScumm.Core/Graphics/Point.cs diff --git a/NScumm.Core/Graphics/Rect.cs b/Src/NScumm.Core/Graphics/Rect.cs similarity index 100% rename from NScumm.Core/Graphics/Rect.cs rename to Src/NScumm.Core/Graphics/Rect.cs diff --git a/NScumm.Core/Graphics/Surface.cs b/Src/NScumm.Core/Graphics/Surface.cs similarity index 100% rename from NScumm.Core/Graphics/Surface.cs rename to Src/NScumm.Core/Graphics/Surface.cs diff --git a/NScumm.Core/Graphics/ThumbnailHeader.cs b/Src/NScumm.Core/Graphics/ThumbnailHeader.cs similarity index 100% rename from NScumm.Core/Graphics/ThumbnailHeader.cs rename to Src/NScumm.Core/Graphics/ThumbnailHeader.cs diff --git a/NScumm.Core/Graphics/YUVToRGBManager.cs b/Src/NScumm.Core/Graphics/YUVToRGBManager.cs similarity index 100% rename from NScumm.Core/Graphics/YUVToRGBManager.cs rename to Src/NScumm.Core/Graphics/YUVToRGBManager.cs diff --git a/NScumm.Core/IAudioManager.cs b/Src/NScumm.Core/IAudioManager.cs similarity index 100% rename from NScumm.Core/IAudioManager.cs rename to Src/NScumm.Core/IAudioManager.cs diff --git a/NScumm.Core/IEnableTrace.cs b/Src/NScumm.Core/IEnableTrace.cs similarity index 100% rename from NScumm.Core/IEnableTrace.cs rename to Src/NScumm.Core/IEnableTrace.cs diff --git a/NScumm.Core/IEngine.cs b/Src/NScumm.Core/IEngine.cs similarity index 100% rename from NScumm.Core/IEngine.cs rename to Src/NScumm.Core/IEngine.cs diff --git a/NScumm.Core/IFileStorage.cs b/Src/NScumm.Core/IFileStorage.cs similarity index 100% rename from NScumm.Core/IFileStorage.cs rename to Src/NScumm.Core/IFileStorage.cs diff --git a/NScumm.Core/IO/GameDetected.cs b/Src/NScumm.Core/IO/GameDetected.cs similarity index 100% rename from NScumm.Core/IO/GameDetected.cs rename to Src/NScumm.Core/IO/GameDetected.cs diff --git a/NScumm.Core/IO/GameDetector.cs b/Src/NScumm.Core/IO/GameDetector.cs similarity index 100% rename from NScumm.Core/IO/GameDetector.cs rename to Src/NScumm.Core/IO/GameDetector.cs diff --git a/NScumm.Core/IO/GameSettings.cs b/Src/NScumm.Core/IO/GameSettings.cs similarity index 100% rename from NScumm.Core/IO/GameSettings.cs rename to Src/NScumm.Core/IO/GameSettings.cs diff --git a/NScumm.Core/IO/IGameDescriptor.cs b/Src/NScumm.Core/IO/IGameDescriptor.cs similarity index 100% rename from NScumm.Core/IO/IGameDescriptor.cs rename to Src/NScumm.Core/IO/IGameDescriptor.cs diff --git a/NScumm.Core/IO/IMetaEngine.cs b/Src/NScumm.Core/IO/IMetaEngine.cs similarity index 100% rename from NScumm.Core/IO/IMetaEngine.cs rename to Src/NScumm.Core/IO/IMetaEngine.cs diff --git a/NScumm.Core/IO/Platform.cs b/Src/NScumm.Core/IO/Platform.cs similarity index 100% rename from NScumm.Core/IO/Platform.cs rename to Src/NScumm.Core/IO/Platform.cs diff --git a/NScumm.Core/IPlatform.cs b/Src/NScumm.Core/IPlatform.cs similarity index 100% rename from NScumm.Core/IPlatform.cs rename to Src/NScumm.Core/IPlatform.cs diff --git a/NScumm.Core/ISaveFileManager.cs b/Src/NScumm.Core/ISaveFileManager.cs similarity index 100% rename from NScumm.Core/ISaveFileManager.cs rename to Src/NScumm.Core/ISaveFileManager.cs diff --git a/NScumm.Core/ISystem.cs b/Src/NScumm.Core/ISystem.cs similarity index 100% rename from NScumm.Core/ISystem.cs rename to Src/NScumm.Core/ISystem.cs diff --git a/NScumm.Core/ITraceFactory.cs b/Src/NScumm.Core/ITraceFactory.cs similarity index 100% rename from NScumm.Core/ITraceFactory.cs rename to Src/NScumm.Core/ITraceFactory.cs diff --git a/NScumm.Core/Input/IInputManager.cs b/Src/NScumm.Core/Input/IInputManager.cs similarity index 100% rename from NScumm.Core/Input/IInputManager.cs rename to Src/NScumm.Core/Input/IInputManager.cs diff --git a/NScumm.Core/Input/KeyCode.cs b/Src/NScumm.Core/Input/KeyCode.cs similarity index 100% rename from NScumm.Core/Input/KeyCode.cs rename to Src/NScumm.Core/Input/KeyCode.cs diff --git a/NScumm.Core/Input/ScummInputState.cs b/Src/NScumm.Core/Input/ScummInputState.cs similarity index 100% rename from NScumm.Core/Input/ScummInputState.cs rename to Src/NScumm.Core/Input/ScummInputState.cs diff --git a/NScumm.Core/Input/ScummMouseButtonState.cs b/Src/NScumm.Core/Input/ScummMouseButtonState.cs similarity index 100% rename from NScumm.Core/Input/ScummMouseButtonState.cs rename to Src/NScumm.Core/Input/ScummMouseButtonState.cs diff --git a/NScumm.Core/NScumm.Core.csproj b/Src/NScumm.Core/NScumm.Core.csproj similarity index 100% rename from NScumm.Core/NScumm.Core.csproj rename to Src/NScumm.Core/NScumm.Core.csproj diff --git a/NScumm.Core/Properties/AssemblyInfo.cs b/Src/NScumm.Core/Properties/AssemblyInfo.cs similarity index 100% rename from NScumm.Core/Properties/AssemblyInfo.cs rename to Src/NScumm.Core/Properties/AssemblyInfo.cs diff --git a/NScumm.Core/Rational.cs b/Src/NScumm.Core/Rational.cs similarity index 100% rename from NScumm.Core/Rational.cs rename to Src/NScumm.Core/Rational.cs diff --git a/NScumm.Core/ScummHelper.cs b/Src/NScumm.Core/ScummHelper.cs similarity index 100% rename from NScumm.Core/ScummHelper.cs rename to Src/NScumm.Core/ScummHelper.cs diff --git a/NScumm.Core/ServiceLocator.cs b/Src/NScumm.Core/ServiceLocator.cs similarity index 100% rename from NScumm.Core/ServiceLocator.cs rename to Src/NScumm.Core/ServiceLocator.cs diff --git a/NScumm.Core/Video/AudioTrack.cs b/Src/NScumm.Core/Video/AudioTrack.cs similarity index 82% rename from NScumm.Core/Video/AudioTrack.cs rename to Src/NScumm.Core/Video/AudioTrack.cs index 8fed13c..01eaa88 100644 --- a/NScumm.Core/Video/AudioTrack.cs +++ b/Src/NScumm.Core/Video/AudioTrack.cs @@ -2,19 +2,7 @@ // scemino // // Copyright (c) 2015 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . + using System; using NScumm.Core.Audio; @@ -119,11 +107,14 @@ public void Start() Mixer.PauseHandle(_handle, true); } - // TODO: + // TODO / FIXIT / RnD public void Start(Timestamp limit) { Stop(); - throw new NotImplementedException(); + + // ? + //throw new NotImplementedException(); + var stream = AudioStream; if (stream == null) throw new InvalidOperationException("stream should not be null"); diff --git a/NScumm.Core/Video/BigHuffmanTree.cs b/Src/NScumm.Core/Video/BigHuffmanTree.cs similarity index 85% rename from NScumm.Core/Video/BigHuffmanTree.cs rename to Src/NScumm.Core/Video/BigHuffmanTree.cs index ef5a37e..8ecd645 100644 --- a/NScumm.Core/Video/BigHuffmanTree.cs +++ b/Src/NScumm.Core/Video/BigHuffmanTree.cs @@ -1,20 +1,10 @@ +// BigHuffmanTree.cs +// // Author: // scemino // // Copyright (c) 2015 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . + using System; using System.Diagnostics; @@ -121,7 +111,9 @@ private uint DecodeTree(uint prefix, int length) _tree[t] = SMK_NODE | r1; +#pragma warning disable CS0675 // , uint r2 = DecodeTree((uint)(prefix | (1 << length)), length + 1); +#pragma warning restore CS0675 // , return r1 + r2 + 1; } @@ -150,7 +142,6 @@ public uint GetCode(BitStream bs) _tree[_last[1]] = _tree[_last[0]]; _tree[_last[0]] = v; } - return v; } } diff --git a/NScumm.Core/Video/FixedRateVideoTrack.cs b/Src/NScumm.Core/Video/FixedRateVideoTrack.cs similarity index 100% rename from NScumm.Core/Video/FixedRateVideoTrack.cs rename to Src/NScumm.Core/Video/FixedRateVideoTrack.cs diff --git a/NScumm.Core/Video/ITrack.cs b/Src/NScumm.Core/Video/ITrack.cs similarity index 100% rename from NScumm.Core/Video/ITrack.cs rename to Src/NScumm.Core/Video/ITrack.cs diff --git a/NScumm.Core/Video/PsxStreamDecoder.Audio.cs b/Src/NScumm.Core/Video/PsxStreamDecoder.Audio.cs similarity index 100% rename from NScumm.Core/Video/PsxStreamDecoder.Audio.cs rename to Src/NScumm.Core/Video/PsxStreamDecoder.Audio.cs diff --git a/NScumm.Core/Video/PsxStreamDecoder.Video.cs b/Src/NScumm.Core/Video/PsxStreamDecoder.Video.cs similarity index 100% rename from NScumm.Core/Video/PsxStreamDecoder.Video.cs rename to Src/NScumm.Core/Video/PsxStreamDecoder.Video.cs diff --git a/NScumm.Core/Video/PsxStreamDecoder.cs b/Src/NScumm.Core/Video/PsxStreamDecoder.cs similarity index 100% rename from NScumm.Core/Video/PsxStreamDecoder.cs rename to Src/NScumm.Core/Video/PsxStreamDecoder.cs diff --git a/NScumm.Core/Video/SmackerAudioTrack.cs b/Src/NScumm.Core/Video/SmackerAudioTrack.cs similarity index 100% rename from NScumm.Core/Video/SmackerAudioTrack.cs rename to Src/NScumm.Core/Video/SmackerAudioTrack.cs diff --git a/NScumm.Core/Video/SmackerDecoder.cs b/Src/NScumm.Core/Video/SmackerDecoder.cs similarity index 100% rename from NScumm.Core/Video/SmackerDecoder.cs rename to Src/NScumm.Core/Video/SmackerDecoder.cs diff --git a/NScumm.Core/Video/SmackerVideoTrack.cs b/Src/NScumm.Core/Video/SmackerVideoTrack.cs similarity index 100% rename from NScumm.Core/Video/SmackerVideoTrack.cs rename to Src/NScumm.Core/Video/SmackerVideoTrack.cs diff --git a/NScumm.Core/Video/SmallHuffmanTree.cs b/Src/NScumm.Core/Video/SmallHuffmanTree.cs similarity index 100% rename from NScumm.Core/Video/SmallHuffmanTree.cs rename to Src/NScumm.Core/Video/SmallHuffmanTree.cs diff --git a/NScumm.Core/Video/Track.cs b/Src/NScumm.Core/Video/Track.cs similarity index 100% rename from NScumm.Core/Video/Track.cs rename to Src/NScumm.Core/Video/Track.cs diff --git a/NScumm.Core/Video/VideoDecoder.cs b/Src/NScumm.Core/Video/VideoDecoder.cs similarity index 95% rename from NScumm.Core/Video/VideoDecoder.cs rename to Src/NScumm.Core/Video/VideoDecoder.cs index 5748345..61c37e0 100644 --- a/NScumm.Core/Video/VideoDecoder.cs +++ b/Src/NScumm.Core/Video/VideoDecoder.cs @@ -1,20 +1,10 @@ +// VideoDecoder.cs +// // Author: // scemino // // Copyright (c) 2015 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . + using System; using System.Collections.Generic; diff --git a/NScumm.Core/Video/VideoTrack.cs b/Src/NScumm.Core/Video/VideoTrack.cs similarity index 100% rename from NScumm.Core/Video/VideoTrack.cs rename to Src/NScumm.Core/Video/VideoTrack.cs diff --git a/NScumm.Platform_UWP/FileStorage.cs b/Src/NScumm.Platform_UWP/FileStorage.cs similarity index 99% rename from NScumm.Platform_UWP/FileStorage.cs rename to Src/NScumm.Platform_UWP/FileStorage.cs index 542cd4d..1c315f7 100644 --- a/NScumm.Platform_UWP/FileStorage.cs +++ b/Src/NScumm.Platform_UWP/FileStorage.cs @@ -1,4 +1,6 @@ -using NScumm.Core; +// FileStorage.cs + +using NScumm.Core; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/NScumm.Platform_UWP/MD5.cs b/Src/NScumm.Platform_UWP/MD5.cs similarity index 100% rename from NScumm.Platform_UWP/MD5.cs rename to Src/NScumm.Platform_UWP/MD5.cs diff --git a/NScumm.Platform_UWP/NScumm.Platform_UWP.csproj b/Src/NScumm.Platform_UWP/NScumm.Platform_UWP.csproj similarity index 100% rename from NScumm.Platform_UWP/NScumm.Platform_UWP.csproj rename to Src/NScumm.Platform_UWP/NScumm.Platform_UWP.csproj diff --git a/NScumm.Platform_UWP/Properties/AssemblyInfo.cs b/Src/NScumm.Platform_UWP/Properties/AssemblyInfo.cs similarity index 100% rename from NScumm.Platform_UWP/Properties/AssemblyInfo.cs rename to Src/NScumm.Platform_UWP/Properties/AssemblyInfo.cs diff --git a/NScumm.Platform_UWP/Properties/NScumm.Platform_UWP.rd.xml b/Src/NScumm.Platform_UWP/Properties/NScumm.Platform_UWP.rd.xml similarity index 100% rename from NScumm.Platform_UWP/Properties/NScumm.Platform_UWP.rd.xml rename to Src/NScumm.Platform_UWP/Properties/NScumm.Platform_UWP.rd.xml diff --git a/NScumm.Platform_UWP/SaveFileManager.cs b/Src/NScumm.Platform_UWP/SaveFileManager.cs similarity index 100% rename from NScumm.Platform_UWP/SaveFileManager.cs rename to Src/NScumm.Platform_UWP/SaveFileManager.cs diff --git a/NScumm.Platform_UWP/WindowsUAPPlatform.cs b/Src/NScumm.Platform_UWP/WindowsUAPPlatform.cs similarity index 100% rename from NScumm.Platform_UWP/WindowsUAPPlatform.cs rename to Src/NScumm.Platform_UWP/WindowsUAPPlatform.cs diff --git a/NScumm.Platform_UWP/project.json b/Src/NScumm.Platform_UWP/project.json similarity index 100% rename from NScumm.Platform_UWP/project.json rename to Src/NScumm.Platform_UWP/project.json diff --git a/NScumm.Scumm/Actor.cs b/Src/NScumm.Scumm/Actor.cs similarity index 100% rename from NScumm.Scumm/Actor.cs rename to Src/NScumm.Scumm/Actor.cs diff --git a/NScumm.Scumm/Actor0.cs b/Src/NScumm.Scumm/Actor0.cs similarity index 100% rename from NScumm.Scumm/Actor0.cs rename to Src/NScumm.Scumm/Actor0.cs diff --git a/NScumm.Scumm/Actor2.cs b/Src/NScumm.Scumm/Actor2.cs similarity index 100% rename from NScumm.Scumm/Actor2.cs rename to Src/NScumm.Scumm/Actor2.cs diff --git a/NScumm.Scumm/Actor3.cs b/Src/NScumm.Scumm/Actor3.cs similarity index 100% rename from NScumm.Scumm/Actor3.cs rename to Src/NScumm.Scumm/Actor3.cs diff --git a/NScumm.Scumm/Audio/Amiga/IPlayerMod.cs b/Src/NScumm.Scumm/Audio/Amiga/IPlayerMod.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/IPlayerMod.cs rename to Src/NScumm.Scumm/Audio/Amiga/IPlayerMod.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Base.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Base.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Base.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Base.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_MultiLooped.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_MultiLooped.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_MultiLooped.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_MultiLooped.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_MultiLoopedDuration.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_MultiLoopedDuration.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_MultiLoopedDuration.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_MultiLoopedDuration.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Music.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Music.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Music.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Music.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Single.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Single.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Single.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Single.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_SingleLooped.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_SingleLooped.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_SingleLooped.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_SingleLooped.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_SingleLoopedPitchbend.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_SingleLoopedPitchbend.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_SingleLoopedPitchbend.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_SingleLoopedPitchbend.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac32.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac32.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac32.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac32.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac44.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac44.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac44.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac44.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac46.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac46.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac46.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac46.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac59.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac59.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac59.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac59.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac61.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac61.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac61.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac61.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac69.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac69.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac69.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_Maniac69.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacDing.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacDing.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacDing.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacDing.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacPhone.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacPhone.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacPhone.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacPhone.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacTentacle.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacTentacle.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacTentacle.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacTentacle.cs diff --git a/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacTypewriter.cs b/Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacTypewriter.cs similarity index 100% rename from NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacTypewriter.cs rename to Src/NScumm.Scumm/Audio/Amiga/V2A_Sound_Special_ManiacTypewriter.cs diff --git a/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction1_FreqUpDown.cs b/Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction1_FreqUpDown.cs similarity index 100% rename from NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction1_FreqUpDown.cs rename to Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction1_FreqUpDown.cs diff --git a/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction2_SymmetricWave.cs b/Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction2_SymmetricWave.cs similarity index 100% rename from NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction2_SymmetricWave.cs rename to Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction2_SymmetricWave.cs diff --git a/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction3_AsymmetricWave.cs b/Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction3_AsymmetricWave.cs similarity index 100% rename from NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction3_AsymmetricWave.cs rename to Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction3_AsymmetricWave.cs diff --git a/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction4_Polyphone.cs b/Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction4_Polyphone.cs similarity index 100% rename from NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction4_Polyphone.cs rename to Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction4_Polyphone.cs diff --git a/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction5_Noise.cs b/Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction5_Noise.cs similarity index 100% rename from NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction5_Noise.cs rename to Src/NScumm.Scumm/Audio/AppleII/AppleII_SoundFunction5_Noise.cs diff --git a/NScumm.Scumm/Audio/AppleII/IAppleII_SoundFunction.cs b/Src/NScumm.Scumm/Audio/AppleII/IAppleII_SoundFunction.cs similarity index 100% rename from NScumm.Scumm/Audio/AppleII/IAppleII_SoundFunction.cs rename to Src/NScumm.Scumm/Audio/AppleII/IAppleII_SoundFunction.cs diff --git a/NScumm.Scumm/Audio/DefaultAudioCDManager.cs b/Src/NScumm.Scumm/Audio/DefaultAudioCDManager.cs similarity index 100% rename from NScumm.Scumm/Audio/DefaultAudioCDManager.cs rename to Src/NScumm.Scumm/Audio/DefaultAudioCDManager.cs diff --git a/NScumm.Scumm/Audio/IMuse/CommandQueue.cs b/Src/NScumm.Scumm/Audio/IMuse/CommandQueue.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/CommandQueue.cs rename to Src/NScumm.Scumm/Audio/IMuse/CommandQueue.cs diff --git a/NScumm.Scumm/Audio/IMuse/DeferredCommand.cs b/Src/NScumm.Scumm/Audio/IMuse/DeferredCommand.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/DeferredCommand.cs rename to Src/NScumm.Scumm/Audio/IMuse/DeferredCommand.cs diff --git a/NScumm.Scumm/Audio/IMuse/HookDatas.cs b/Src/NScumm.Scumm/Audio/IMuse/HookDatas.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/HookDatas.cs rename to Src/NScumm.Scumm/Audio/IMuse/HookDatas.cs diff --git a/NScumm.Scumm/Audio/IMuse/IImuse.cs b/Src/NScumm.Scumm/Audio/IMuse/IImuse.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IImuse.cs rename to Src/NScumm.Scumm/Audio/IMuse/IImuse.cs diff --git a/NScumm.Scumm/Audio/IMuse/IInstrumentInternal.cs b/Src/NScumm.Scumm/Audio/IMuse/IInstrumentInternal.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IInstrumentInternal.cs rename to Src/NScumm.Scumm/Audio/IMuse/IInstrumentInternal.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleCodecs.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleCodecs.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleCodecs.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleCodecs.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleDirCache.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleDirCache.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleDirCache.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleDirCache.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleMgr.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleMgr.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleMgr.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/BundleMgr.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigiSndMgr.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigiSndMgr.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigiSndMgr.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigiSndMgr.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Music.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Music.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Music.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Music.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Script.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Script.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Script.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Script.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Tables.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Tables.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Tables.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Tables.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Track.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Track.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Track.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/IMuseDigital_Track.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/ImuseTrack.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/ImuseTrack.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/ImuseTrack.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/ImuseTrack.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseDigital/SoundDesc.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/SoundDesc.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseDigital/SoundDesc.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseDigital/SoundDesc.cs diff --git a/NScumm.Scumm/Audio/IMuse/IMuseInternal.cs b/Src/NScumm.Scumm/Audio/IMuse/IMuseInternal.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/IMuseInternal.cs rename to Src/NScumm.Scumm/Audio/IMuse/IMuseInternal.cs diff --git a/NScumm.Scumm/Audio/IMuse/ISysEx.cs b/Src/NScumm.Scumm/Audio/IMuse/ISysEx.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/ISysEx.cs rename to Src/NScumm.Scumm/Audio/IMuse/ISysEx.cs diff --git a/NScumm.Scumm/Audio/IMuse/ImTrigger.cs b/Src/NScumm.Scumm/Audio/IMuse/ImTrigger.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/ImTrigger.cs rename to Src/NScumm.Scumm/Audio/IMuse/ImTrigger.cs diff --git a/NScumm.Scumm/Audio/IMuse/Instrument.cs b/Src/NScumm.Scumm/Audio/IMuse/Instrument.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/Instrument.cs rename to Src/NScumm.Scumm/Audio/IMuse/Instrument.cs diff --git a/NScumm.Scumm/Audio/IMuse/InstrumentAdLib.cs b/Src/NScumm.Scumm/Audio/IMuse/InstrumentAdLib.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/InstrumentAdLib.cs rename to Src/NScumm.Scumm/Audio/IMuse/InstrumentAdLib.cs diff --git a/NScumm.Scumm/Audio/IMuse/InstrumentPcSpk.cs b/Src/NScumm.Scumm/Audio/IMuse/InstrumentPcSpk.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/InstrumentPcSpk.cs rename to Src/NScumm.Scumm/Audio/IMuse/InstrumentPcSpk.cs diff --git a/NScumm.Scumm/Audio/IMuse/InstrumentProgram.cs b/Src/NScumm.Scumm/Audio/IMuse/InstrumentProgram.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/InstrumentProgram.cs rename to Src/NScumm.Scumm/Audio/IMuse/InstrumentProgram.cs diff --git a/NScumm.Scumm/Audio/IMuse/ParameterFader.cs b/Src/NScumm.Scumm/Audio/IMuse/ParameterFader.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/ParameterFader.cs rename to Src/NScumm.Scumm/Audio/IMuse/ParameterFader.cs diff --git a/NScumm.Scumm/Audio/IMuse/Part.cs b/Src/NScumm.Scumm/Audio/IMuse/Part.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/Part.cs rename to Src/NScumm.Scumm/Audio/IMuse/Part.cs diff --git a/NScumm.Scumm/Audio/IMuse/Player.cs b/Src/NScumm.Scumm/Audio/IMuse/Player.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/Player.cs rename to Src/NScumm.Scumm/Audio/IMuse/Player.cs diff --git a/NScumm.Scumm/Audio/IMuse/SamAndMaxSysEx.cs b/Src/NScumm.Scumm/Audio/IMuse/SamAndMaxSysEx.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/SamAndMaxSysEx.cs rename to Src/NScumm.Scumm/Audio/IMuse/SamAndMaxSysEx.cs diff --git a/NScumm.Scumm/Audio/IMuse/ScummSysEx.cs b/Src/NScumm.Scumm/Audio/IMuse/ScummSysEx.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/ScummSysEx.cs rename to Src/NScumm.Scumm/Audio/IMuse/ScummSysEx.cs diff --git a/NScumm.Scumm/Audio/IMuse/TimerCallbackInfo.cs b/Src/NScumm.Scumm/Audio/IMuse/TimerCallbackInfo.cs similarity index 100% rename from NScumm.Scumm/Audio/IMuse/TimerCallbackInfo.cs rename to Src/NScumm.Scumm/Audio/IMuse/TimerCallbackInfo.cs diff --git a/NScumm.Scumm/Audio/IMusicEngine.cs b/Src/NScumm.Scumm/Audio/IMusicEngine.cs similarity index 100% rename from NScumm.Scumm/Audio/IMusicEngine.cs rename to Src/NScumm.Scumm/Audio/IMusicEngine.cs diff --git a/NScumm.Scumm/Audio/Players/Player_AD.cs b/Src/NScumm.Scumm/Audio/Players/Player_AD.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_AD.cs rename to Src/NScumm.Scumm/Audio/Players/Player_AD.cs diff --git a/NScumm.Scumm/Audio/Players/Player_AppleII.cs b/Src/NScumm.Scumm/Audio/Players/Player_AppleII.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_AppleII.cs rename to Src/NScumm.Scumm/Audio/Players/Player_AppleII.cs diff --git a/NScumm.Scumm/Audio/Players/Player_MOD.cs b/Src/NScumm.Scumm/Audio/Players/Player_MOD.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_MOD.cs rename to Src/NScumm.Scumm/Audio/Players/Player_MOD.cs diff --git a/NScumm.Scumm/Audio/Players/Player_Mac.cs b/Src/NScumm.Scumm/Audio/Players/Player_Mac.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_Mac.cs rename to Src/NScumm.Scumm/Audio/Players/Player_Mac.cs diff --git a/NScumm.Scumm/Audio/Players/Player_SID.cs b/Src/NScumm.Scumm/Audio/Players/Player_SID.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_SID.cs rename to Src/NScumm.Scumm/Audio/Players/Player_SID.cs diff --git a/NScumm.Scumm/Audio/Players/Player_Towns.cs b/Src/NScumm.Scumm/Audio/Players/Player_Towns.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_Towns.cs rename to Src/NScumm.Scumm/Audio/Players/Player_Towns.cs diff --git a/NScumm.Scumm/Audio/Players/Player_Towns_v1.cs b/Src/NScumm.Scumm/Audio/Players/Player_Towns_v1.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_Towns_v1.cs rename to Src/NScumm.Scumm/Audio/Players/Player_Towns_v1.cs diff --git a/NScumm.Scumm/Audio/Players/Player_Towns_v2.cs b/Src/NScumm.Scumm/Audio/Players/Player_Towns_v2.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_Towns_v2.cs rename to Src/NScumm.Scumm/Audio/Players/Player_Towns_v2.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V1.cs b/Src/NScumm.Scumm/Audio/Players/Player_V1.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V1.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V1.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V2.cs b/Src/NScumm.Scumm/Audio/Players/Player_V2.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V2.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V2.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V2A.cs b/Src/NScumm.Scumm/Audio/Players/Player_V2A.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V2A.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V2A.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V2Base.cs b/Src/NScumm.Scumm/Audio/Players/Player_V2Base.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V2Base.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V2Base.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V2CMS.cs b/Src/NScumm.Scumm/Audio/Players/Player_V2CMS.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V2CMS.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V2CMS.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V3A.cs b/Src/NScumm.Scumm/Audio/Players/Player_V3A.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V3A.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V3A.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V3M.cs b/Src/NScumm.Scumm/Audio/Players/Player_V3M.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V3M.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V3M.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V4A.cs b/Src/NScumm.Scumm/Audio/Players/Player_V4A.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V4A.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V4A.cs diff --git a/NScumm.Scumm/Audio/Players/Player_V5M.cs b/Src/NScumm.Scumm/Audio/Players/Player_V5M.cs similarity index 100% rename from NScumm.Scumm/Audio/Players/Player_V5M.cs rename to Src/NScumm.Scumm/Audio/Players/Player_V5M.cs diff --git a/NScumm.Scumm/Audio/SampleBuffer.cs b/Src/NScumm.Scumm/Audio/SampleBuffer.cs similarity index 100% rename from NScumm.Scumm/Audio/SampleBuffer.cs rename to Src/NScumm.Scumm/Audio/SampleBuffer.cs diff --git a/NScumm.Scumm/Audio/SampleConverter.cs b/Src/NScumm.Scumm/Audio/SampleConverter.cs similarity index 100% rename from NScumm.Scumm/Audio/SampleConverter.cs rename to Src/NScumm.Scumm/Audio/SampleConverter.cs diff --git a/NScumm.Scumm/BlastObject.cs b/Src/NScumm.Scumm/BlastObject.cs similarity index 100% rename from NScumm.Scumm/BlastObject.cs rename to Src/NScumm.Scumm/BlastObject.cs diff --git a/NScumm.Scumm/BlastText.cs b/Src/NScumm.Scumm/BlastText.cs similarity index 100% rename from NScumm.Scumm/BlastText.cs rename to Src/NScumm.Scumm/BlastText.cs diff --git a/NScumm.Scumm/Box.cs b/Src/NScumm.Scumm/Box.cs similarity index 100% rename from NScumm.Scumm/Box.cs rename to Src/NScumm.Scumm/Box.cs diff --git a/NScumm.Scumm/BoxCoords.cs b/Src/NScumm.Scumm/BoxCoords.cs similarity index 100% rename from NScumm.Scumm/BoxCoords.cs rename to Src/NScumm.Scumm/BoxCoords.cs diff --git a/NScumm.Scumm/Camera.cs b/Src/NScumm.Scumm/Camera.cs similarity index 100% rename from NScumm.Scumm/Camera.cs rename to Src/NScumm.Scumm/Camera.cs diff --git a/NScumm.Scumm/ClickArea.cs b/Src/NScumm.Scumm/ClickArea.cs similarity index 100% rename from NScumm.Scumm/ClickArea.cs rename to Src/NScumm.Scumm/ClickArea.cs diff --git a/NScumm.Scumm/ColorCycle.cs b/Src/NScumm.Scumm/ColorCycle.cs similarity index 100% rename from NScumm.Scumm/ColorCycle.cs rename to Src/NScumm.Scumm/ColorCycle.cs diff --git a/NScumm.Scumm/CostumeData.cs b/Src/NScumm.Scumm/CostumeData.cs similarity index 100% rename from NScumm.Scumm/CostumeData.cs rename to Src/NScumm.Scumm/CostumeData.cs diff --git a/NScumm.Scumm/Cursor.cs b/Src/NScumm.Scumm/Cursor.cs similarity index 100% rename from NScumm.Scumm/Cursor.cs rename to Src/NScumm.Scumm/Cursor.cs diff --git a/NScumm.Scumm/CutScene.cs b/Src/NScumm.Scumm/CutScene.cs similarity index 100% rename from NScumm.Scumm/CutScene.cs rename to Src/NScumm.Scumm/CutScene.cs diff --git a/NScumm.Scumm/FlashLight.cs b/Src/NScumm.Scumm/FlashLight.cs similarity index 100% rename from NScumm.Scumm/FlashLight.cs rename to Src/NScumm.Scumm/FlashLight.cs diff --git a/NScumm.Scumm/Graphics/AkosRenderer.cs b/Src/NScumm.Scumm/Graphics/AkosRenderer.cs similarity index 100% rename from NScumm.Scumm/Graphics/AkosRenderer.cs rename to Src/NScumm.Scumm/Graphics/AkosRenderer.cs diff --git a/NScumm.Scumm/Graphics/BaseCostumeRenderer.cs b/Src/NScumm.Scumm/Graphics/BaseCostumeRenderer.cs similarity index 100% rename from NScumm.Scumm/Graphics/BaseCostumeRenderer.cs rename to Src/NScumm.Scumm/Graphics/BaseCostumeRenderer.cs diff --git a/NScumm.Scumm/Graphics/BompDrawData.cs b/Src/NScumm.Scumm/Graphics/BompDrawData.cs similarity index 100% rename from NScumm.Scumm/Graphics/BompDrawData.cs rename to Src/NScumm.Scumm/Graphics/BompDrawData.cs diff --git a/NScumm.Scumm/Graphics/CharsetRenderer.cs b/Src/NScumm.Scumm/Graphics/CharsetRenderer.cs similarity index 100% rename from NScumm.Scumm/Graphics/CharsetRenderer.cs rename to Src/NScumm.Scumm/Graphics/CharsetRenderer.cs diff --git a/NScumm.Scumm/Graphics/CharsetRenderer2.cs b/Src/NScumm.Scumm/Graphics/CharsetRenderer2.cs similarity index 100% rename from NScumm.Scumm/Graphics/CharsetRenderer2.cs rename to Src/NScumm.Scumm/Graphics/CharsetRenderer2.cs diff --git a/NScumm.Scumm/Graphics/CharsetRenderer3.cs b/Src/NScumm.Scumm/Graphics/CharsetRenderer3.cs similarity index 100% rename from NScumm.Scumm/Graphics/CharsetRenderer3.cs rename to Src/NScumm.Scumm/Graphics/CharsetRenderer3.cs diff --git a/NScumm.Scumm/Graphics/CharsetRendererClassic.cs b/Src/NScumm.Scumm/Graphics/CharsetRendererClassic.cs similarity index 100% rename from NScumm.Scumm/Graphics/CharsetRendererClassic.cs rename to Src/NScumm.Scumm/Graphics/CharsetRendererClassic.cs diff --git a/NScumm.Scumm/Graphics/CharsetRendererCommon.cs b/Src/NScumm.Scumm/Graphics/CharsetRendererCommon.cs similarity index 100% rename from NScumm.Scumm/Graphics/CharsetRendererCommon.cs rename to Src/NScumm.Scumm/Graphics/CharsetRendererCommon.cs diff --git a/NScumm.Scumm/Graphics/CharsetRendererNut.cs b/Src/NScumm.Scumm/Graphics/CharsetRendererNut.cs similarity index 100% rename from NScumm.Scumm/Graphics/CharsetRendererNut.cs rename to Src/NScumm.Scumm/Graphics/CharsetRendererNut.cs diff --git a/NScumm.Scumm/Graphics/CharsetRendererTowns3.cs b/Src/NScumm.Scumm/Graphics/CharsetRendererTowns3.cs similarity index 100% rename from NScumm.Scumm/Graphics/CharsetRendererTowns3.cs rename to Src/NScumm.Scumm/Graphics/CharsetRendererTowns3.cs diff --git a/NScumm.Scumm/Graphics/CharsetRendererTownsClassic.cs b/Src/NScumm.Scumm/Graphics/CharsetRendererTownsClassic.cs similarity index 100% rename from NScumm.Scumm/Graphics/CharsetRendererTownsClassic.cs rename to Src/NScumm.Scumm/Graphics/CharsetRendererTownsClassic.cs diff --git a/NScumm.Scumm/Graphics/ClassicCostumeRenderer.cs b/Src/NScumm.Scumm/Graphics/ClassicCostumeRenderer.cs similarity index 100% rename from NScumm.Scumm/Graphics/ClassicCostumeRenderer.cs rename to Src/NScumm.Scumm/Graphics/ClassicCostumeRenderer.cs diff --git a/NScumm.Scumm/Graphics/CostumeRenderer0.cs b/Src/NScumm.Scumm/Graphics/CostumeRenderer0.cs similarity index 100% rename from NScumm.Scumm/Graphics/CostumeRenderer0.cs rename to Src/NScumm.Scumm/Graphics/CostumeRenderer0.cs diff --git a/NScumm.Scumm/Graphics/Gdi.cs b/Src/NScumm.Scumm/Graphics/Gdi.cs similarity index 100% rename from NScumm.Scumm/Graphics/Gdi.cs rename to Src/NScumm.Scumm/Graphics/Gdi.cs diff --git a/NScumm.Scumm/Graphics/Gdi1.cs b/Src/NScumm.Scumm/Graphics/Gdi1.cs similarity index 100% rename from NScumm.Scumm/Graphics/Gdi1.cs rename to Src/NScumm.Scumm/Graphics/Gdi1.cs diff --git a/NScumm.Scumm/Graphics/Gdi2.cs b/Src/NScumm.Scumm/Graphics/Gdi2.cs similarity index 100% rename from NScumm.Scumm/Graphics/Gdi2.cs rename to Src/NScumm.Scumm/Graphics/Gdi2.cs diff --git a/NScumm.Scumm/Graphics/ICostumeRenderer.cs b/Src/NScumm.Scumm/Graphics/ICostumeRenderer.cs similarity index 100% rename from NScumm.Scumm/Graphics/ICostumeRenderer.cs rename to Src/NScumm.Scumm/Graphics/ICostumeRenderer.cs diff --git a/NScumm.Scumm/Graphics/ImageData.cs b/Src/NScumm.Scumm/Graphics/ImageData.cs similarity index 100% rename from NScumm.Scumm/Graphics/ImageData.cs rename to Src/NScumm.Scumm/Graphics/ImageData.cs diff --git a/NScumm.Scumm/Graphics/NutRenderer.cs b/Src/NScumm.Scumm/Graphics/NutRenderer.cs similarity index 100% rename from NScumm.Scumm/Graphics/NutRenderer.cs rename to Src/NScumm.Scumm/Graphics/NutRenderer.cs diff --git a/NScumm.Scumm/Graphics/Palette.cs b/Src/NScumm.Scumm/Graphics/Palette.cs similarity index 100% rename from NScumm.Scumm/Graphics/Palette.cs rename to Src/NScumm.Scumm/Graphics/Palette.cs diff --git a/NScumm.Scumm/Graphics/PixelNavigator.cs b/Src/NScumm.Scumm/Graphics/PixelNavigator.cs similarity index 100% rename from NScumm.Scumm/Graphics/PixelNavigator.cs rename to Src/NScumm.Scumm/Graphics/PixelNavigator.cs diff --git a/NScumm.Scumm/Graphics/TownsScreen.cs b/Src/NScumm.Scumm/Graphics/TownsScreen.cs similarity index 100% rename from NScumm.Scumm/Graphics/TownsScreen.cs rename to Src/NScumm.Scumm/Graphics/TownsScreen.cs diff --git a/NScumm.Scumm/Graphics/VirtScreen.cs b/Src/NScumm.Scumm/Graphics/VirtScreen.cs similarity index 100% rename from NScumm.Scumm/Graphics/VirtScreen.cs rename to Src/NScumm.Scumm/Graphics/VirtScreen.cs diff --git a/NScumm.Scumm/Graphics/ZPlane.cs b/Src/NScumm.Scumm/Graphics/ZPlane.cs similarity index 100% rename from NScumm.Scumm/Graphics/ZPlane.cs rename to Src/NScumm.Scumm/Graphics/ZPlane.cs diff --git a/NScumm.Scumm/IO/AkosCostumeLoader.cs b/Src/NScumm.Scumm/IO/AkosCostumeLoader.cs similarity index 100% rename from NScumm.Scumm/IO/AkosCostumeLoader.cs rename to Src/NScumm.Scumm/IO/AkosCostumeLoader.cs diff --git a/NScumm.Scumm/IO/AkosHeader.cs b/Src/NScumm.Scumm/IO/AkosHeader.cs similarity index 100% rename from NScumm.Scumm/IO/AkosHeader.cs rename to Src/NScumm.Scumm/IO/AkosHeader.cs diff --git a/NScumm.Scumm/IO/ChunkIterator3.cs b/Src/NScumm.Scumm/IO/ChunkIterator3.cs similarity index 100% rename from NScumm.Scumm/IO/ChunkIterator3.cs rename to Src/NScumm.Scumm/IO/ChunkIterator3.cs diff --git a/NScumm.Scumm/IO/ChunkIterator5.cs b/Src/NScumm.Scumm/IO/ChunkIterator5.cs similarity index 100% rename from NScumm.Scumm/IO/ChunkIterator5.cs rename to Src/NScumm.Scumm/IO/ChunkIterator5.cs diff --git a/NScumm.Scumm/IO/ClassicCostumeLoader.cs b/Src/NScumm.Scumm/IO/ClassicCostumeLoader.cs similarity index 100% rename from NScumm.Scumm/IO/ClassicCostumeLoader.cs rename to Src/NScumm.Scumm/IO/ClassicCostumeLoader.cs diff --git a/NScumm.Scumm/IO/CostumeLoader0.cs b/Src/NScumm.Scumm/IO/CostumeLoader0.cs similarity index 100% rename from NScumm.Scumm/IO/CostumeLoader0.cs rename to Src/NScumm.Scumm/IO/CostumeLoader0.cs diff --git a/NScumm.Scumm/IO/GameInfo.cs b/Src/NScumm.Scumm/IO/GameInfo.cs similarity index 100% rename from NScumm.Scumm/IO/GameInfo.cs rename to Src/NScumm.Scumm/IO/GameInfo.cs diff --git a/NScumm.Scumm/IO/GameManager.cs b/Src/NScumm.Scumm/IO/GameManager.cs similarity index 89% rename from NScumm.Scumm/IO/GameManager.cs rename to Src/NScumm.Scumm/IO/GameManager.cs index f065a8d..b07449f 100644 --- a/NScumm.Scumm/IO/GameManager.cs +++ b/Src/NScumm.Scumm/IO/GameManager.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; @@ -53,8 +54,9 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } + var features = ParseFeatures((string)attFeatures); var attMusic = game.Attribute("music"); var music = ParseMusic((string)attMusic); @@ -66,8 +68,9 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } + info = new GameInfo { MD5 = signature, @@ -85,7 +88,7 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } } @@ -100,7 +103,7 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } LanguagesListReady = true; } @@ -130,7 +133,7 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } var gameId = ""; var gameVariant = ""; @@ -152,7 +155,7 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } try @@ -171,14 +174,14 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } } } } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } try @@ -199,7 +202,7 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } } } @@ -221,14 +224,14 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } } } } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } try @@ -245,13 +248,13 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } } } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } try @@ -273,7 +276,7 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } } @@ -294,6 +297,8 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); + tempVariant = gameCodeData[1]; } } @@ -309,6 +314,7 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); gameVariant = tempVariant; } } @@ -316,7 +322,7 @@ public GameInfo GetInfo(string path) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } info = new GameInfo { @@ -353,13 +359,13 @@ GameFeatures ParseFeatures(string feature) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } } } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } return features; } @@ -379,13 +385,13 @@ MusicDriverTypes ParseMusic(string music) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } } } catch (Exception ex) { - + Debug.WriteLine("[ex] (GameManager) : " + ex.Message); } return musics; } diff --git a/NScumm.Scumm/IO/ICostumeLoader.cs b/Src/NScumm.Scumm/IO/ICostumeLoader.cs similarity index 100% rename from NScumm.Scumm/IO/ICostumeLoader.cs rename to Src/NScumm.Scumm/IO/ICostumeLoader.cs diff --git a/NScumm.Scumm/IO/MacResManager.cs b/Src/NScumm.Scumm/IO/MacResManager.cs similarity index 100% rename from NScumm.Scumm/IO/MacResManager.cs rename to Src/NScumm.Scumm/IO/MacResManager.cs diff --git a/NScumm.Scumm/IO/Nscumm.xml b/Src/NScumm.Scumm/IO/Nscumm.xml similarity index 100% rename from NScumm.Scumm/IO/Nscumm.xml rename to Src/NScumm.Scumm/IO/Nscumm.xml diff --git a/NScumm.Scumm/IO/Nscumm.xsd b/Src/NScumm.Scumm/IO/Nscumm.xsd similarity index 100% rename from NScumm.Scumm/IO/Nscumm.xsd rename to Src/NScumm.Scumm/IO/Nscumm.xsd diff --git a/NScumm.Scumm/IO/ResourceFile.cs b/Src/NScumm.Scumm/IO/ResourceFile.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile.cs rename to Src/NScumm.Scumm/IO/ResourceFile.cs diff --git a/NScumm.Scumm/IO/ResourceFile0.cs b/Src/NScumm.Scumm/IO/ResourceFile0.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile0.cs rename to Src/NScumm.Scumm/IO/ResourceFile0.cs diff --git a/NScumm.Scumm/IO/ResourceFile1.cs b/Src/NScumm.Scumm/IO/ResourceFile1.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile1.cs rename to Src/NScumm.Scumm/IO/ResourceFile1.cs diff --git a/NScumm.Scumm/IO/ResourceFile2.cs b/Src/NScumm.Scumm/IO/ResourceFile2.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile2.cs rename to Src/NScumm.Scumm/IO/ResourceFile2.cs diff --git a/NScumm.Scumm/IO/ResourceFile3.cs b/Src/NScumm.Scumm/IO/ResourceFile3.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile3.cs rename to Src/NScumm.Scumm/IO/ResourceFile3.cs diff --git a/NScumm.Scumm/IO/ResourceFile3_16.cs b/Src/NScumm.Scumm/IO/ResourceFile3_16.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile3_16.cs rename to Src/NScumm.Scumm/IO/ResourceFile3_16.cs diff --git a/NScumm.Scumm/IO/ResourceFile4.cs b/Src/NScumm.Scumm/IO/ResourceFile4.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile4.cs rename to Src/NScumm.Scumm/IO/ResourceFile4.cs diff --git a/NScumm.Scumm/IO/ResourceFile5.cs b/Src/NScumm.Scumm/IO/ResourceFile5.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile5.cs rename to Src/NScumm.Scumm/IO/ResourceFile5.cs diff --git a/NScumm.Scumm/IO/ResourceFile6.cs b/Src/NScumm.Scumm/IO/ResourceFile6.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile6.cs rename to Src/NScumm.Scumm/IO/ResourceFile6.cs diff --git a/NScumm.Scumm/IO/ResourceFile7.cs b/Src/NScumm.Scumm/IO/ResourceFile7.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile7.cs rename to Src/NScumm.Scumm/IO/ResourceFile7.cs diff --git a/NScumm.Scumm/IO/ResourceFile8.cs b/Src/NScumm.Scumm/IO/ResourceFile8.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceFile8.cs rename to Src/NScumm.Scumm/IO/ResourceFile8.cs diff --git a/NScumm.Scumm/IO/ResourceIndex.cs b/Src/NScumm.Scumm/IO/ResourceIndex.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex.cs rename to Src/NScumm.Scumm/IO/ResourceIndex.cs diff --git a/NScumm.Scumm/IO/ResourceIndex0.cs b/Src/NScumm.Scumm/IO/ResourceIndex0.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex0.cs rename to Src/NScumm.Scumm/IO/ResourceIndex0.cs diff --git a/NScumm.Scumm/IO/ResourceIndex2.cs b/Src/NScumm.Scumm/IO/ResourceIndex2.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex2.cs rename to Src/NScumm.Scumm/IO/ResourceIndex2.cs diff --git a/NScumm.Scumm/IO/ResourceIndex3.cs b/Src/NScumm.Scumm/IO/ResourceIndex3.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex3.cs rename to Src/NScumm.Scumm/IO/ResourceIndex3.cs diff --git a/NScumm.Scumm/IO/ResourceIndex3_16.cs b/Src/NScumm.Scumm/IO/ResourceIndex3_16.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex3_16.cs rename to Src/NScumm.Scumm/IO/ResourceIndex3_16.cs diff --git a/NScumm.Scumm/IO/ResourceIndex4.cs b/Src/NScumm.Scumm/IO/ResourceIndex4.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex4.cs rename to Src/NScumm.Scumm/IO/ResourceIndex4.cs diff --git a/NScumm.Scumm/IO/ResourceIndex5.cs b/Src/NScumm.Scumm/IO/ResourceIndex5.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex5.cs rename to Src/NScumm.Scumm/IO/ResourceIndex5.cs diff --git a/NScumm.Scumm/IO/ResourceIndex6.cs b/Src/NScumm.Scumm/IO/ResourceIndex6.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex6.cs rename to Src/NScumm.Scumm/IO/ResourceIndex6.cs diff --git a/NScumm.Scumm/IO/ResourceIndex7.cs b/Src/NScumm.Scumm/IO/ResourceIndex7.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex7.cs rename to Src/NScumm.Scumm/IO/ResourceIndex7.cs diff --git a/NScumm.Scumm/IO/ResourceIndex8.cs b/Src/NScumm.Scumm/IO/ResourceIndex8.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceIndex8.cs rename to Src/NScumm.Scumm/IO/ResourceIndex8.cs diff --git a/NScumm.Scumm/IO/ResourceManager.cs b/Src/NScumm.Scumm/IO/ResourceManager.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager.cs rename to Src/NScumm.Scumm/IO/ResourceManager.cs diff --git a/NScumm.Scumm/IO/ResourceManager0.cs b/Src/NScumm.Scumm/IO/ResourceManager0.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager0.cs rename to Src/NScumm.Scumm/IO/ResourceManager0.cs diff --git a/NScumm.Scumm/IO/ResourceManager2.cs b/Src/NScumm.Scumm/IO/ResourceManager2.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager2.cs rename to Src/NScumm.Scumm/IO/ResourceManager2.cs diff --git a/NScumm.Scumm/IO/ResourceManager3.cs b/Src/NScumm.Scumm/IO/ResourceManager3.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager3.cs rename to Src/NScumm.Scumm/IO/ResourceManager3.cs diff --git a/NScumm.Scumm/IO/ResourceManager4.cs b/Src/NScumm.Scumm/IO/ResourceManager4.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager4.cs rename to Src/NScumm.Scumm/IO/ResourceManager4.cs diff --git a/NScumm.Scumm/IO/ResourceManager5.cs b/Src/NScumm.Scumm/IO/ResourceManager5.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager5.cs rename to Src/NScumm.Scumm/IO/ResourceManager5.cs diff --git a/NScumm.Scumm/IO/ResourceManager6.cs b/Src/NScumm.Scumm/IO/ResourceManager6.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager6.cs rename to Src/NScumm.Scumm/IO/ResourceManager6.cs diff --git a/NScumm.Scumm/IO/ResourceManager7.cs b/Src/NScumm.Scumm/IO/ResourceManager7.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager7.cs rename to Src/NScumm.Scumm/IO/ResourceManager7.cs diff --git a/NScumm.Scumm/IO/ResourceManager8.cs b/Src/NScumm.Scumm/IO/ResourceManager8.cs similarity index 100% rename from NScumm.Scumm/IO/ResourceManager8.cs rename to Src/NScumm.Scumm/IO/ResourceManager8.cs diff --git a/NScumm.Scumm/IO/ScummDiskImage.cs b/Src/NScumm.Scumm/IO/ScummDiskImage.cs similarity index 100% rename from NScumm.Scumm/IO/ScummDiskImage.cs rename to Src/NScumm.Scumm/IO/ScummDiskImage.cs diff --git a/NScumm.Scumm/IO/ScummMetaEngine.cs b/Src/NScumm.Scumm/IO/ScummMetaEngine.cs similarity index 100% rename from NScumm.Scumm/IO/ScummMetaEngine.cs rename to Src/NScumm.Scumm/IO/ScummMetaEngine.cs diff --git a/NScumm.Scumm/IO/Serializer.cs b/Src/NScumm.Scumm/IO/Serializer.cs similarity index 100% rename from NScumm.Scumm/IO/Serializer.cs rename to Src/NScumm.Scumm/IO/Serializer.cs diff --git a/NScumm.Scumm/IO/XorStream.cs b/Src/NScumm.Scumm/IO/XorStream.cs similarity index 100% rename from NScumm.Scumm/IO/XorStream.cs rename to Src/NScumm.Scumm/IO/XorStream.cs diff --git a/NScumm.Scumm/IScummTextDecoder.cs b/Src/NScumm.Scumm/IScummTextDecoder.cs similarity index 100% rename from NScumm.Scumm/IScummTextDecoder.cs rename to Src/NScumm.Scumm/IScummTextDecoder.cs diff --git a/NScumm.Scumm/Insane/Insane.cs b/Src/NScumm.Scumm/Insane/Insane.cs similarity index 100% rename from NScumm.Scumm/Insane/Insane.cs rename to Src/NScumm.Scumm/Insane/Insane.cs diff --git a/NScumm.Scumm/Insane/Insane_Ben.cs b/Src/NScumm.Scumm/Insane/Insane_Ben.cs similarity index 100% rename from NScumm.Scumm/Insane/Insane_Ben.cs rename to Src/NScumm.Scumm/Insane/Insane_Ben.cs diff --git a/NScumm.Scumm/Insane/Insane_Enemy.cs b/Src/NScumm.Scumm/Insane/Insane_Enemy.cs similarity index 100% rename from NScumm.Scumm/Insane/Insane_Enemy.cs rename to Src/NScumm.Scumm/Insane/Insane_Enemy.cs diff --git a/NScumm.Scumm/Insane/Insane_Iact.cs b/Src/NScumm.Scumm/Insane/Insane_Iact.cs similarity index 100% rename from NScumm.Scumm/Insane/Insane_Iact.cs rename to Src/NScumm.Scumm/Insane/Insane_Iact.cs diff --git a/NScumm.Scumm/Insane/Insane_Scenes.cs b/Src/NScumm.Scumm/Insane/Insane_Scenes.cs similarity index 100% rename from NScumm.Scumm/Insane/Insane_Scenes.cs rename to Src/NScumm.Scumm/Insane/Insane_Scenes.cs diff --git a/NScumm.Scumm/Languages/Language.cs b/Src/NScumm.Scumm/Languages/Language.cs similarity index 100% rename from NScumm.Scumm/Languages/Language.cs rename to Src/NScumm.Scumm/Languages/Language.cs diff --git a/NScumm.Scumm/Languages/LanguageAttribute.cs b/Src/NScumm.Scumm/Languages/LanguageAttribute.cs similarity index 100% rename from NScumm.Scumm/Languages/LanguageAttribute.cs rename to Src/NScumm.Scumm/Languages/LanguageAttribute.cs diff --git a/NScumm.Scumm/Languages/LanguageHelpers.cs b/Src/NScumm.Scumm/Languages/LanguageHelpers.cs similarity index 100% rename from NScumm.Scumm/Languages/LanguageHelpers.cs rename to Src/NScumm.Scumm/Languages/LanguageHelpers.cs diff --git a/NScumm.Scumm/Languages/LanguageIsNotSupportedException.cs b/Src/NScumm.Scumm/Languages/LanguageIsNotSupportedException.cs similarity index 100% rename from NScumm.Scumm/Languages/LanguageIsNotSupportedException.cs rename to Src/NScumm.Scumm/Languages/LanguageIsNotSupportedException.cs diff --git a/NScumm.Scumm/Languages/LanguageModel.cs b/Src/NScumm.Scumm/Languages/LanguageModel.cs similarity index 100% rename from NScumm.Scumm/Languages/LanguageModel.cs rename to Src/NScumm.Scumm/Languages/LanguageModel.cs diff --git a/NScumm.Scumm/Languages/Languages.cs b/Src/NScumm.Scumm/Languages/Languages.cs similarity index 100% rename from NScumm.Scumm/Languages/Languages.cs rename to Src/NScumm.Scumm/Languages/Languages.cs diff --git a/NScumm.Scumm/Languages/LanguagesJSON.cs b/Src/NScumm.Scumm/Languages/LanguagesJSON.cs similarity index 100% rename from NScumm.Scumm/Languages/LanguagesJSON.cs rename to Src/NScumm.Scumm/Languages/LanguagesJSON.cs diff --git a/NScumm.Scumm/NScumm.Scumm.csproj b/Src/NScumm.Scumm/NScumm.Scumm.csproj similarity index 100% rename from NScumm.Scumm/NScumm.Scumm.csproj rename to Src/NScumm.Scumm/NScumm.Scumm.csproj diff --git a/NScumm.Scumm/NestedScript.cs b/Src/NScumm.Scumm/NestedScript.cs similarity index 100% rename from NScumm.Scumm/NestedScript.cs rename to Src/NScumm.Scumm/NestedScript.cs diff --git a/NScumm.Scumm/ObjectData.cs b/Src/NScumm.Scumm/ObjectData.cs similarity index 100% rename from NScumm.Scumm/ObjectData.cs rename to Src/NScumm.Scumm/ObjectData.cs diff --git a/NScumm.Scumm/OpCodeAttribute.cs b/Src/NScumm.Scumm/OpCodeAttribute.cs similarity index 100% rename from NScumm.Scumm/OpCodeAttribute.cs rename to Src/NScumm.Scumm/OpCodeAttribute.cs diff --git a/NScumm.Scumm/Properties/AssemblyInfo.cs b/Src/NScumm.Scumm/Properties/AssemblyInfo.cs similarity index 100% rename from NScumm.Scumm/Properties/AssemblyInfo.cs rename to Src/NScumm.Scumm/Properties/AssemblyInfo.cs diff --git a/NScumm.Scumm/Room.cs b/Src/NScumm.Scumm/Room.cs similarity index 100% rename from NScumm.Scumm/Room.cs rename to Src/NScumm.Scumm/Room.cs diff --git a/NScumm.Scumm/ScaleSlot.cs b/Src/NScumm.Scumm/ScaleSlot.cs similarity index 100% rename from NScumm.Scumm/ScaleSlot.cs rename to Src/NScumm.Scumm/ScaleSlot.cs diff --git a/NScumm.Scumm/ScriptData.cs b/Src/NScumm.Scumm/ScriptData.cs similarity index 100% rename from NScumm.Scumm/ScriptData.cs rename to Src/NScumm.Scumm/ScriptData.cs diff --git a/NScumm.Scumm/ScriptSlot.cs b/Src/NScumm.Scumm/ScriptSlot.cs similarity index 100% rename from NScumm.Scumm/ScriptSlot.cs rename to Src/NScumm.Scumm/ScriptSlot.cs diff --git a/NScumm.Scumm/ScummEngine.cs b/Src/NScumm.Scumm/ScummEngine.cs similarity index 100% rename from NScumm.Scumm/ScummEngine.cs rename to Src/NScumm.Scumm/ScummEngine.cs diff --git a/NScumm.Scumm/ScummEngine0.cs b/Src/NScumm.Scumm/ScummEngine0.cs similarity index 100% rename from NScumm.Scumm/ScummEngine0.cs rename to Src/NScumm.Scumm/ScummEngine0.cs diff --git a/NScumm.Scumm/ScummEngine0_Actor.cs b/Src/NScumm.Scumm/ScummEngine0_Actor.cs similarity index 100% rename from NScumm.Scumm/ScummEngine0_Actor.cs rename to Src/NScumm.Scumm/ScummEngine0_Actor.cs diff --git a/NScumm.Scumm/ScummEngine0_Variable.cs b/Src/NScumm.Scumm/ScummEngine0_Variable.cs similarity index 100% rename from NScumm.Scumm/ScummEngine0_Variable.cs rename to Src/NScumm.Scumm/ScummEngine0_Variable.cs diff --git a/NScumm.Scumm/ScummEngine0_Verb.cs b/Src/NScumm.Scumm/ScummEngine0_Verb.cs similarity index 100% rename from NScumm.Scumm/ScummEngine0_Verb.cs rename to Src/NScumm.Scumm/ScummEngine0_Verb.cs diff --git a/NScumm.Scumm/ScummEngine2.cs b/Src/NScumm.Scumm/ScummEngine2.cs similarity index 100% rename from NScumm.Scumm/ScummEngine2.cs rename to Src/NScumm.Scumm/ScummEngine2.cs diff --git a/NScumm.Scumm/ScummEngine3.cs b/Src/NScumm.Scumm/ScummEngine3.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3.cs rename to Src/NScumm.Scumm/ScummEngine3.cs diff --git a/NScumm.Scumm/ScummEngine3_Actor.cs b/Src/NScumm.Scumm/ScummEngine3_Actor.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Actor.cs rename to Src/NScumm.Scumm/ScummEngine3_Actor.cs diff --git a/NScumm.Scumm/ScummEngine3_Camera.cs b/Src/NScumm.Scumm/ScummEngine3_Camera.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Camera.cs rename to Src/NScumm.Scumm/ScummEngine3_Camera.cs diff --git a/NScumm.Scumm/ScummEngine3_Cursor.cs b/Src/NScumm.Scumm/ScummEngine3_Cursor.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Cursor.cs rename to Src/NScumm.Scumm/ScummEngine3_Cursor.cs diff --git a/NScumm.Scumm/ScummEngine3_Drawing.cs b/Src/NScumm.Scumm/ScummEngine3_Drawing.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Drawing.cs rename to Src/NScumm.Scumm/ScummEngine3_Drawing.cs diff --git a/NScumm.Scumm/ScummEngine3_Expression.cs b/Src/NScumm.Scumm/ScummEngine3_Expression.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Expression.cs rename to Src/NScumm.Scumm/ScummEngine3_Expression.cs diff --git a/NScumm.Scumm/ScummEngine3_Inventory.cs b/Src/NScumm.Scumm/ScummEngine3_Inventory.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Inventory.cs rename to Src/NScumm.Scumm/ScummEngine3_Inventory.cs diff --git a/NScumm.Scumm/ScummEngine3_Light.cs b/Src/NScumm.Scumm/ScummEngine3_Light.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Light.cs rename to Src/NScumm.Scumm/ScummEngine3_Light.cs diff --git a/NScumm.Scumm/ScummEngine3_Object.cs b/Src/NScumm.Scumm/ScummEngine3_Object.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Object.cs rename to Src/NScumm.Scumm/ScummEngine3_Object.cs diff --git a/NScumm.Scumm/ScummEngine3_Room.cs b/Src/NScumm.Scumm/ScummEngine3_Room.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Room.cs rename to Src/NScumm.Scumm/ScummEngine3_Room.cs diff --git a/NScumm.Scumm/ScummEngine3_SaveLoad.cs b/Src/NScumm.Scumm/ScummEngine3_SaveLoad.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_SaveLoad.cs rename to Src/NScumm.Scumm/ScummEngine3_SaveLoad.cs diff --git a/NScumm.Scumm/ScummEngine3_Script.cs b/Src/NScumm.Scumm/ScummEngine3_Script.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Script.cs rename to Src/NScumm.Scumm/ScummEngine3_Script.cs diff --git a/NScumm.Scumm/ScummEngine3_String.cs b/Src/NScumm.Scumm/ScummEngine3_String.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_String.cs rename to Src/NScumm.Scumm/ScummEngine3_String.cs diff --git a/NScumm.Scumm/ScummEngine3_Verb.cs b/Src/NScumm.Scumm/ScummEngine3_Verb.cs similarity index 100% rename from NScumm.Scumm/ScummEngine3_Verb.cs rename to Src/NScumm.Scumm/ScummEngine3_Verb.cs diff --git a/NScumm.Scumm/ScummEngine4.cs b/Src/NScumm.Scumm/ScummEngine4.cs similarity index 100% rename from NScumm.Scumm/ScummEngine4.cs rename to Src/NScumm.Scumm/ScummEngine4.cs diff --git a/NScumm.Scumm/ScummEngine5.cs b/Src/NScumm.Scumm/ScummEngine5.cs similarity index 100% rename from NScumm.Scumm/ScummEngine5.cs rename to Src/NScumm.Scumm/ScummEngine5.cs diff --git a/NScumm.Scumm/ScummEngine6.cs b/Src/NScumm.Scumm/ScummEngine6.cs similarity index 64% rename from NScumm.Scumm/ScummEngine6.cs rename to Src/NScumm.Scumm/ScummEngine6.cs index b5d18d0..af854a6 100644 --- a/NScumm.Scumm/ScummEngine6.cs +++ b/Src/NScumm.Scumm/ScummEngine6.cs @@ -5,22 +5,10 @@ // Scemino // // Copyright (c) 2014 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Reflection; using NScumm.Core; @@ -51,7 +39,9 @@ partial class ScummEngine6: ScummEngine5 protected int? VariableBlastAboveText; protected int? VariableCharsetMask; - public ScummEngine6(GameSettings game, IGraphicsManager graphicsManager, IInputManager inputManager, IMixer mixer) + public ScummEngine6(GameSettings game, + IGraphicsManager graphicsManager, + IInputManager inputManager, IMixer mixer) : base(game, graphicsManager, inputManager, mixer) { } @@ -62,7 +52,9 @@ protected override void ResetScummVars() foreach (var array in _resManager.ArrayDefinitions) { - DefineArray(array.Index, array.Type == 0 ? ArrayType.IntArray : (ArrayType)array.Type, array.Dim2, array.Dim1); + DefineArray(array.Index, array.Type == 0 + ? ArrayType.IntArray + : (ArrayType)array.Type, array.Dim2, array.Dim1); } } @@ -110,8 +102,11 @@ private static int GetDepth(Type type) protected override void InitOpCodes() { - var opcodes = (from method in GetType().GetMethods(BindingFlags.Instance | BindingFlags.NonPublic) - let attributes = (OpCodeAttribute[])method.GetCustomAttributes(typeof(OpCodeAttribute), false) + var opcodes = (from method + in GetType().GetMethods(BindingFlags.Instance | BindingFlags.NonPublic) + let attributes = + (OpCodeAttribute[])method.GetCustomAttributes + (typeof(OpCodeAttribute), false) from attribute in attributes from id in attribute.Ids group method by id); @@ -120,7 +115,8 @@ from id in attribute.Ids _opCodes = new Dictionary(); foreach (var op in opcodes) { - _opCodes.Add(op.Key, op.OrderByDescending(o => GetDepth(o.DeclaringType)).Select(OpCode).First()); + _opCodes.Add(op.Key, op.OrderByDescending( + o => GetDepth(o.DeclaringType)).Select(OpCode).First()); } } @@ -159,34 +155,37 @@ Action OpCode(MethodInfo method) } } - var action = new Action(() => - { - try + Action action = new Action(() => + { + try + { + var parameterNames = method.GetParameters().Select(p => p.Name).ToArray(); + var parameters = args.Select(arg => arg()).Reverse().ToArray(); + this.Trace().Write(TraceSwitches.OpCodes, + "Room = {1,3}, Script = {0,3}, Offset = {4,4}, Name = [{3:X2}] {2}({5})", + Slots[CurrentScript].Number, + _roomResource, + _opCodes.ContainsKey(_opCode) ? method.Name : "Unknown", + _opCode, + CurrentPos - 1, + string.Join(",", parameters.Select((p, i) + => string.Format("{0}={1}", parameterNames[i], GetDebuggerDisplayFor(p))))); + + method.Invoke(this, parameters); + } + catch (Exception ex) + { + /*if (System.Diagnostics.Debugger.IsAttached) { - var parameterNames = method.GetParameters().Select(p => p.Name).ToArray(); - var parameters = args.Select(arg => arg()).Reverse().ToArray(); - this.Trace().Write(TraceSwitches.OpCodes, "Room = {1,3}, Script = {0,3}, Offset = {4,4}, Name = [{3:X2}] {2}({5})", - Slots[CurrentScript].Number, - _roomResource, - _opCodes.ContainsKey(_opCode) ? method.Name : "Unknown", - _opCode, - CurrentPos - 1, - string.Join(",", parameters.Select((p, i) => string.Format("{0}={1}", parameterNames[i], GetDebuggerDisplayFor(p))))); - - method.Invoke(this, parameters); + System.Diagnostics.Debugger.Break(); } - catch (Exception) + else { - if (System.Diagnostics.Debugger.IsAttached) - { - System.Diagnostics.Debugger.Break(); - } - else - { - throw; - } - } - }); + throw; + }*/ + Debug.WriteLine("[ex] Action OpCode ex.: " + ex.Message); + } + }); return action; } diff --git a/NScumm.Scumm/ScummEngine6_Actor.cs b/Src/NScumm.Scumm/ScummEngine6_Actor.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Actor.cs rename to Src/NScumm.Scumm/ScummEngine6_Actor.cs diff --git a/NScumm.Scumm/ScummEngine6_Array.cs b/Src/NScumm.Scumm/ScummEngine6_Array.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Array.cs rename to Src/NScumm.Scumm/ScummEngine6_Array.cs diff --git a/NScumm.Scumm/ScummEngine6_Audio.cs b/Src/NScumm.Scumm/ScummEngine6_Audio.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Audio.cs rename to Src/NScumm.Scumm/ScummEngine6_Audio.cs diff --git a/NScumm.Scumm/ScummEngine6_Camera.cs b/Src/NScumm.Scumm/ScummEngine6_Camera.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Camera.cs rename to Src/NScumm.Scumm/ScummEngine6_Camera.cs diff --git a/NScumm.Scumm/ScummEngine6_Cursor.cs b/Src/NScumm.Scumm/ScummEngine6_Cursor.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Cursor.cs rename to Src/NScumm.Scumm/ScummEngine6_Cursor.cs diff --git a/NScumm.Scumm/ScummEngine6_Expression.cs b/Src/NScumm.Scumm/ScummEngine6_Expression.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Expression.cs rename to Src/NScumm.Scumm/ScummEngine6_Expression.cs diff --git a/NScumm.Scumm/ScummEngine6_Inventory.cs b/Src/NScumm.Scumm/ScummEngine6_Inventory.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Inventory.cs rename to Src/NScumm.Scumm/ScummEngine6_Inventory.cs diff --git a/NScumm.Scumm/ScummEngine6_Misc.cs b/Src/NScumm.Scumm/ScummEngine6_Misc.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Misc.cs rename to Src/NScumm.Scumm/ScummEngine6_Misc.cs diff --git a/NScumm.Scumm/ScummEngine6_Object.cs b/Src/NScumm.Scumm/ScummEngine6_Object.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Object.cs rename to Src/NScumm.Scumm/ScummEngine6_Object.cs diff --git a/NScumm.Scumm/ScummEngine6_Resources.cs b/Src/NScumm.Scumm/ScummEngine6_Resources.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Resources.cs rename to Src/NScumm.Scumm/ScummEngine6_Resources.cs diff --git a/NScumm.Scumm/ScummEngine6_Room.cs b/Src/NScumm.Scumm/ScummEngine6_Room.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Room.cs rename to Src/NScumm.Scumm/ScummEngine6_Room.cs diff --git a/NScumm.Scumm/ScummEngine6_Script.cs b/Src/NScumm.Scumm/ScummEngine6_Script.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Script.cs rename to Src/NScumm.Scumm/ScummEngine6_Script.cs diff --git a/NScumm.Scumm/ScummEngine6_String.cs b/Src/NScumm.Scumm/ScummEngine6_String.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_String.cs rename to Src/NScumm.Scumm/ScummEngine6_String.cs diff --git a/NScumm.Scumm/ScummEngine6_Variable.cs b/Src/NScumm.Scumm/ScummEngine6_Variable.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Variable.cs rename to Src/NScumm.Scumm/ScummEngine6_Variable.cs diff --git a/NScumm.Scumm/ScummEngine6_Verb.cs b/Src/NScumm.Scumm/ScummEngine6_Verb.cs similarity index 100% rename from NScumm.Scumm/ScummEngine6_Verb.cs rename to Src/NScumm.Scumm/ScummEngine6_Verb.cs diff --git a/NScumm.Scumm/ScummEngine7.cs b/Src/NScumm.Scumm/ScummEngine7.cs similarity index 100% rename from NScumm.Scumm/ScummEngine7.cs rename to Src/NScumm.Scumm/ScummEngine7.cs diff --git a/NScumm.Scumm/ScummEngine7_Misc.cs b/Src/NScumm.Scumm/ScummEngine7_Misc.cs similarity index 100% rename from NScumm.Scumm/ScummEngine7_Misc.cs rename to Src/NScumm.Scumm/ScummEngine7_Misc.cs diff --git a/NScumm.Scumm/ScummEngine8.cs b/Src/NScumm.Scumm/ScummEngine8.cs similarity index 100% rename from NScumm.Scumm/ScummEngine8.cs rename to Src/NScumm.Scumm/ScummEngine8.cs diff --git a/NScumm.Scumm/ScummEngine_Actor.cs b/Src/NScumm.Scumm/ScummEngine_Actor.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Actor.cs rename to Src/NScumm.Scumm/ScummEngine_Actor.cs diff --git a/NScumm.Scumm/ScummEngine_Audio.cs b/Src/NScumm.Scumm/ScummEngine_Audio.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Audio.cs rename to Src/NScumm.Scumm/ScummEngine_Audio.cs diff --git a/NScumm.Scumm/ScummEngine_Box.cs b/Src/NScumm.Scumm/ScummEngine_Box.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Box.cs rename to Src/NScumm.Scumm/ScummEngine_Box.cs diff --git a/NScumm.Scumm/ScummEngine_Camera.cs b/Src/NScumm.Scumm/ScummEngine_Camera.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Camera.cs rename to Src/NScumm.Scumm/ScummEngine_Camera.cs diff --git a/NScumm.Scumm/ScummEngine_Charset.cs b/Src/NScumm.Scumm/ScummEngine_Charset.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Charset.cs rename to Src/NScumm.Scumm/ScummEngine_Charset.cs diff --git a/NScumm.Scumm/ScummEngine_Cursor.cs b/Src/NScumm.Scumm/ScummEngine_Cursor.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Cursor.cs rename to Src/NScumm.Scumm/ScummEngine_Cursor.cs diff --git a/NScumm.Scumm/ScummEngine_Drawing.cs b/Src/NScumm.Scumm/ScummEngine_Drawing.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Drawing.cs rename to Src/NScumm.Scumm/ScummEngine_Drawing.cs diff --git a/NScumm.Scumm/ScummEngine_Effect.cs b/Src/NScumm.Scumm/ScummEngine_Effect.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Effect.cs rename to Src/NScumm.Scumm/ScummEngine_Effect.cs diff --git a/NScumm.Scumm/ScummEngine_Input.cs b/Src/NScumm.Scumm/ScummEngine_Input.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Input.cs rename to Src/NScumm.Scumm/ScummEngine_Input.cs diff --git a/NScumm.Scumm/ScummEngine_Inventory.cs b/Src/NScumm.Scumm/ScummEngine_Inventory.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Inventory.cs rename to Src/NScumm.Scumm/ScummEngine_Inventory.cs diff --git a/NScumm.Scumm/ScummEngine_Light.cs b/Src/NScumm.Scumm/ScummEngine_Light.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Light.cs rename to Src/NScumm.Scumm/ScummEngine_Light.cs diff --git a/NScumm.Scumm/ScummEngine_Object.cs b/Src/NScumm.Scumm/ScummEngine_Object.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Object.cs rename to Src/NScumm.Scumm/ScummEngine_Object.cs diff --git a/NScumm.Scumm/ScummEngine_Palette.cs b/Src/NScumm.Scumm/ScummEngine_Palette.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Palette.cs rename to Src/NScumm.Scumm/ScummEngine_Palette.cs diff --git a/NScumm.Scumm/ScummEngine_Room.cs b/Src/NScumm.Scumm/ScummEngine_Room.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Room.cs rename to Src/NScumm.Scumm/ScummEngine_Room.cs diff --git a/NScumm.Scumm/ScummEngine_SaveLoad.cs b/Src/NScumm.Scumm/ScummEngine_SaveLoad.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_SaveLoad.cs rename to Src/NScumm.Scumm/ScummEngine_SaveLoad.cs diff --git a/NScumm.Scumm/ScummEngine_Script.cs b/Src/NScumm.Scumm/ScummEngine_Script.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Script.cs rename to Src/NScumm.Scumm/ScummEngine_Script.cs diff --git a/NScumm.Scumm/ScummEngine_String.cs b/Src/NScumm.Scumm/ScummEngine_String.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_String.cs rename to Src/NScumm.Scumm/ScummEngine_String.cs diff --git a/NScumm.Scumm/ScummEngine_Variable.cs b/Src/NScumm.Scumm/ScummEngine_Variable.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Variable.cs rename to Src/NScumm.Scumm/ScummEngine_Variable.cs diff --git a/NScumm.Scumm/ScummEngine_Verb.cs b/Src/NScumm.Scumm/ScummEngine_Verb.cs similarity index 100% rename from NScumm.Scumm/ScummEngine_Verb.cs rename to Src/NScumm.Scumm/ScummEngine_Verb.cs diff --git a/NScumm.Scumm/ScummMath.cs b/Src/NScumm.Scumm/ScummMath.cs similarity index 100% rename from NScumm.Scumm/ScummMath.cs rename to Src/NScumm.Scumm/ScummMath.cs diff --git a/NScumm.Scumm/ScummText.cs b/Src/NScumm.Scumm/ScummText.cs similarity index 100% rename from NScumm.Scumm/ScummText.cs rename to Src/NScumm.Scumm/ScummText.cs diff --git a/NScumm.Scumm/Sentence.cs b/Src/NScumm.Scumm/Sentence.cs similarity index 100% rename from NScumm.Scumm/Sentence.cs rename to Src/NScumm.Scumm/Sentence.cs diff --git a/NScumm.Scumm/Smush/Codec37Decoder.cs b/Src/NScumm.Scumm/Smush/Codec37Decoder.cs similarity index 100% rename from NScumm.Scumm/Smush/Codec37Decoder.cs rename to Src/NScumm.Scumm/Smush/Codec37Decoder.cs diff --git a/NScumm.Scumm/Smush/Codec47Decoder.cs b/Src/NScumm.Scumm/Smush/Codec47Decoder.cs similarity index 100% rename from NScumm.Scumm/Smush/Codec47Decoder.cs rename to Src/NScumm.Scumm/Smush/Codec47Decoder.cs diff --git a/NScumm.Scumm/Smush/ImuseChannel.cs b/Src/NScumm.Scumm/Smush/ImuseChannel.cs similarity index 100% rename from NScumm.Scumm/Smush/ImuseChannel.cs rename to Src/NScumm.Scumm/Smush/ImuseChannel.cs diff --git a/NScumm.Scumm/Smush/SaudChannel.cs b/Src/NScumm.Scumm/Smush/SaudChannel.cs similarity index 100% rename from NScumm.Scumm/Smush/SaudChannel.cs rename to Src/NScumm.Scumm/Smush/SaudChannel.cs diff --git a/NScumm.Scumm/Smush/SmushChannel.cs b/Src/NScumm.Scumm/Smush/SmushChannel.cs similarity index 100% rename from NScumm.Scumm/Smush/SmushChannel.cs rename to Src/NScumm.Scumm/Smush/SmushChannel.cs diff --git a/NScumm.Scumm/Smush/SmushFont.cs b/Src/NScumm.Scumm/Smush/SmushFont.cs similarity index 100% rename from NScumm.Scumm/Smush/SmushFont.cs rename to Src/NScumm.Scumm/Smush/SmushFont.cs diff --git a/NScumm.Scumm/Smush/SmushMixer.cs b/Src/NScumm.Scumm/Smush/SmushMixer.cs similarity index 100% rename from NScumm.Scumm/Smush/SmushMixer.cs rename to Src/NScumm.Scumm/Smush/SmushMixer.cs diff --git a/NScumm.Scumm/Smush/SmushPlayer.cs b/Src/NScumm.Scumm/Smush/SmushPlayer.cs similarity index 100% rename from NScumm.Scumm/Smush/SmushPlayer.cs rename to Src/NScumm.Scumm/Smush/SmushPlayer.cs diff --git a/NScumm.Scumm/Smush/TrsFile.cs b/Src/NScumm.Scumm/Smush/TrsFile.cs similarity index 100% rename from NScumm.Scumm/Smush/TrsFile.cs rename to Src/NScumm.Scumm/Smush/TrsFile.cs diff --git a/NScumm.Scumm/Sound.cs b/Src/NScumm.Scumm/Sound.cs similarity index 100% rename from NScumm.Scumm/Sound.cs rename to Src/NScumm.Scumm/Sound.cs diff --git a/NScumm.Scumm/SubtitleText.cs b/Src/NScumm.Scumm/SubtitleText.cs similarity index 100% rename from NScumm.Scumm/SubtitleText.cs rename to Src/NScumm.Scumm/SubtitleText.cs diff --git a/NScumm.Scumm/TextObject.cs b/Src/NScumm.Scumm/TextObject.cs similarity index 100% rename from NScumm.Scumm/TextObject.cs rename to Src/NScumm.Scumm/TextObject.cs diff --git a/NScumm.Scumm/TextSlot.cs b/Src/NScumm.Scumm/TextSlot.cs similarity index 100% rename from NScumm.Scumm/TextSlot.cs rename to Src/NScumm.Scumm/TextSlot.cs diff --git a/NScumm.Scumm/TraceSwitches.cs b/Src/NScumm.Scumm/TraceSwitches.cs similarity index 100% rename from NScumm.Scumm/TraceSwitches.cs rename to Src/NScumm.Scumm/TraceSwitches.cs diff --git a/NScumm.Scumm/VerbSlot.cs b/Src/NScumm.Scumm/VerbSlot.cs similarity index 100% rename from NScumm.Scumm/VerbSlot.cs rename to Src/NScumm.Scumm/VerbSlot.cs diff --git a/NScumm.Scumm/packages.config b/Src/NScumm.Scumm/packages.config similarity index 100% rename from NScumm.Scumm/packages.config rename to Src/NScumm.Scumm/packages.config diff --git a/NScumm.Sky/AutoRoute.cs b/Src/NScumm.Sky/AutoRoute.cs similarity index 100% rename from NScumm.Sky/AutoRoute.cs rename to Src/NScumm.Sky/AutoRoute.cs diff --git a/NScumm.Sky/Compact.cs b/Src/NScumm.Sky/Compact.cs similarity index 100% rename from NScumm.Sky/Compact.cs rename to Src/NScumm.Sky/Compact.cs diff --git a/NScumm.Sky/Control.cs b/Src/NScumm.Sky/Control.cs similarity index 100% rename from NScumm.Sky/Control.cs rename to Src/NScumm.Sky/Control.cs diff --git a/NScumm.Sky/Debug.cs b/Src/NScumm.Sky/Debug.cs similarity index 100% rename from NScumm.Sky/Debug.cs rename to Src/NScumm.Sky/Debug.cs diff --git a/NScumm.Sky/Disk.cs b/Src/NScumm.Sky/Disk.cs similarity index 100% rename from NScumm.Sky/Disk.cs rename to Src/NScumm.Sky/Disk.cs diff --git a/NScumm.Sky/Grid.cs b/Src/NScumm.Sky/Grid.cs similarity index 100% rename from NScumm.Sky/Grid.cs rename to Src/NScumm.Sky/Grid.cs diff --git a/NScumm.Sky/Intro.Sequences.cs b/Src/NScumm.Sky/Intro.Sequences.cs similarity index 100% rename from NScumm.Sky/Intro.Sequences.cs rename to Src/NScumm.Sky/Intro.Sequences.cs diff --git a/NScumm.Sky/Intro.cs b/Src/NScumm.Sky/Intro.cs similarity index 100% rename from NScumm.Sky/Intro.cs rename to Src/NScumm.Sky/Intro.cs diff --git a/NScumm.Sky/Logic.Logic.cs b/Src/NScumm.Sky/Logic.Logic.cs similarity index 100% rename from NScumm.Sky/Logic.Logic.cs rename to Src/NScumm.Sky/Logic.Logic.cs diff --git a/NScumm.Sky/Logic.Mcode.cs b/Src/NScumm.Sky/Logic.Mcode.cs similarity index 100% rename from NScumm.Sky/Logic.Mcode.cs rename to Src/NScumm.Sky/Logic.Mcode.cs diff --git a/NScumm.Sky/Logic.cs b/Src/NScumm.Sky/Logic.cs similarity index 100% rename from NScumm.Sky/Logic.cs rename to Src/NScumm.Sky/Logic.cs diff --git a/NScumm.Sky/Mouse.cs b/Src/NScumm.Sky/Mouse.cs similarity index 100% rename from NScumm.Sky/Mouse.cs rename to Src/NScumm.Sky/Mouse.cs diff --git a/NScumm.Sky/Music/AdLibChannel.cs b/Src/NScumm.Sky/Music/AdLibChannel.cs similarity index 95% rename from NScumm.Sky/Music/AdLibChannel.cs rename to Src/NScumm.Sky/Music/AdLibChannel.cs index 0c4c056..bd06e55 100644 --- a/NScumm.Sky/Music/AdLibChannel.cs +++ b/Src/NScumm.Sky/Music/AdLibChannel.cs @@ -1,20 +1,10 @@ -// Author: +// AdLibChannel.cs +// +// Author: // scemino // // Copyright (c) 2015 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . + using NScumm.Core; using NScumm.Core.Audio.OPL; diff --git a/NScumm.Sky/Music/AdLibMusic.cs b/Src/NScumm.Sky/Music/AdLibMusic.cs similarity index 100% rename from NScumm.Sky/Music/AdLibMusic.cs rename to Src/NScumm.Sky/Music/AdLibMusic.cs diff --git a/NScumm.Sky/Music/GmChannel.cs b/Src/NScumm.Sky/Music/GmChannel.cs similarity index 100% rename from NScumm.Sky/Music/GmChannel.cs rename to Src/NScumm.Sky/Music/GmChannel.cs diff --git a/NScumm.Sky/Music/GmMusic.cs b/Src/NScumm.Sky/Music/GmMusic.cs similarity index 100% rename from NScumm.Sky/Music/GmMusic.cs rename to Src/NScumm.Sky/Music/GmMusic.cs diff --git a/NScumm.Sky/Music/Mt32Music.cs b/Src/NScumm.Sky/Music/Mt32Music.cs similarity index 100% rename from NScumm.Sky/Music/Mt32Music.cs rename to Src/NScumm.Sky/Music/Mt32Music.cs diff --git a/NScumm.Sky/Music/MusicBase.cs b/Src/NScumm.Sky/Music/MusicBase.cs similarity index 100% rename from NScumm.Sky/Music/MusicBase.cs rename to Src/NScumm.Sky/Music/MusicBase.cs diff --git a/NScumm.Sky/NScumm.Sky.csproj b/Src/NScumm.Sky/NScumm.Sky.csproj similarity index 100% rename from NScumm.Sky/NScumm.Sky.csproj rename to Src/NScumm.Sky/NScumm.Sky.csproj diff --git a/NScumm.Sky/Properties/AssemblyInfo.cs b/Src/NScumm.Sky/Properties/AssemblyInfo.cs similarity index 100% rename from NScumm.Sky/Properties/AssemblyInfo.cs rename to Src/NScumm.Sky/Properties/AssemblyInfo.cs diff --git a/NScumm.Sky/RawAccess.cs b/Src/NScumm.Sky/RawAccess.cs similarity index 100% rename from NScumm.Sky/RawAccess.cs rename to Src/NScumm.Sky/RawAccess.cs diff --git a/NScumm.Sky/RncDecoder.cs b/Src/NScumm.Sky/RncDecoder.cs similarity index 100% rename from NScumm.Sky/RncDecoder.cs rename to Src/NScumm.Sky/RncDecoder.cs diff --git a/NScumm.Sky/Screen.cs b/Src/NScumm.Sky/Screen.cs similarity index 100% rename from NScumm.Sky/Screen.cs rename to Src/NScumm.Sky/Screen.cs diff --git a/NScumm.Sky/SkyDefines.cs b/Src/NScumm.Sky/SkyDefines.cs similarity index 100% rename from NScumm.Sky/SkyDefines.cs rename to Src/NScumm.Sky/SkyDefines.cs diff --git a/NScumm.Sky/SkyDefines.tt b/Src/NScumm.Sky/SkyDefines.tt similarity index 100% rename from NScumm.Sky/SkyDefines.tt rename to Src/NScumm.Sky/SkyDefines.tt diff --git a/NScumm.Sky/SkyEngine.cs b/Src/NScumm.Sky/SkyEngine.cs similarity index 100% rename from NScumm.Sky/SkyEngine.cs rename to Src/NScumm.Sky/SkyEngine.cs diff --git a/NScumm.Sky/SkyMetaEngine.cs b/Src/NScumm.Sky/SkyMetaEngine.cs similarity index 100% rename from NScumm.Sky/SkyMetaEngine.cs rename to Src/NScumm.Sky/SkyMetaEngine.cs diff --git a/NScumm.Sky/SkySystem.cs b/Src/NScumm.Sky/SkySystem.cs similarity index 100% rename from NScumm.Sky/SkySystem.cs rename to Src/NScumm.Sky/SkySystem.cs diff --git a/NScumm.Sky/Sound.Data.cs b/Src/NScumm.Sky/Sound.Data.cs similarity index 100% rename from NScumm.Sky/Sound.Data.cs rename to Src/NScumm.Sky/Sound.Data.cs diff --git a/NScumm.Sky/Sound.cs b/Src/NScumm.Sky/Sound.cs similarity index 100% rename from NScumm.Sky/Sound.cs rename to Src/NScumm.Sky/Sound.cs diff --git a/NScumm.Sky/Text.HuffTree.cs b/Src/NScumm.Sky/Text.HuffTree.cs similarity index 100% rename from NScumm.Sky/Text.HuffTree.cs rename to Src/NScumm.Sky/Text.HuffTree.cs diff --git a/NScumm.Sky/Text.cs b/Src/NScumm.Sky/Text.cs similarity index 100% rename from NScumm.Sky/Text.cs rename to Src/NScumm.Sky/Text.cs diff --git a/NScumm.Sky/sky.cpt b/Src/NScumm.Sky/sky.cpt similarity index 100% rename from NScumm.Sky/sky.cpt rename to Src/NScumm.Sky/sky.cpt diff --git a/NScumm.Sky/skydefs.h b/Src/NScumm.Sky/skydefs.h similarity index 100% rename from NScumm.Sky/skydefs.h rename to Src/NScumm.Sky/skydefs.h diff --git a/NScumm.Sword1/Control.cs b/Src/NScumm.Sword1/Control.cs similarity index 100% rename from NScumm.Sword1/Control.cs rename to Src/NScumm.Sword1/Control.cs diff --git a/NScumm.Sword1/ControlButton.cs b/Src/NScumm.Sword1/ControlButton.cs similarity index 100% rename from NScumm.Sword1/ControlButton.cs rename to Src/NScumm.Sword1/ControlButton.cs diff --git a/NScumm.Sword1/EventManager.cs b/Src/NScumm.Sword1/EventManager.cs similarity index 100% rename from NScumm.Sword1/EventManager.cs rename to Src/NScumm.Sword1/EventManager.cs diff --git a/NScumm.Sword1/Logic.Mcode.cs b/Src/NScumm.Sword1/Logic.Mcode.cs similarity index 100% rename from NScumm.Sword1/Logic.Mcode.cs rename to Src/NScumm.Sword1/Logic.Mcode.cs diff --git a/NScumm.Sword1/Logic.cs b/Src/NScumm.Sword1/Logic.cs similarity index 100% rename from NScumm.Sword1/Logic.cs rename to Src/NScumm.Sword1/Logic.cs diff --git a/NScumm.Sword1/MemMan.cs b/Src/NScumm.Sword1/MemMan.cs similarity index 100% rename from NScumm.Sword1/MemMan.cs rename to Src/NScumm.Sword1/MemMan.cs diff --git a/NScumm.Sword1/Menu.cs b/Src/NScumm.Sword1/Menu.cs similarity index 100% rename from NScumm.Sword1/Menu.cs rename to Src/NScumm.Sword1/Menu.cs diff --git a/NScumm.Sword1/MenuIcon.cs b/Src/NScumm.Sword1/MenuIcon.cs similarity index 100% rename from NScumm.Sword1/MenuIcon.cs rename to Src/NScumm.Sword1/MenuIcon.cs diff --git a/NScumm.Sword1/Mouse.cs b/Src/NScumm.Sword1/Mouse.cs similarity index 100% rename from NScumm.Sword1/Mouse.cs rename to Src/NScumm.Sword1/Mouse.cs diff --git a/NScumm.Sword1/MoviePlayer.cs b/Src/NScumm.Sword1/MoviePlayer.cs similarity index 100% rename from NScumm.Sword1/MoviePlayer.cs rename to Src/NScumm.Sword1/MoviePlayer.cs diff --git a/NScumm.Sword1/Music.cs b/Src/NScumm.Sword1/Music.cs similarity index 100% rename from NScumm.Sword1/Music.cs rename to Src/NScumm.Sword1/Music.cs diff --git a/NScumm.Sword1/NScumm.Sword1.csproj b/Src/NScumm.Sword1/NScumm.Sword1.csproj similarity index 100% rename from NScumm.Sword1/NScumm.Sword1.csproj rename to Src/NScumm.Sword1/NScumm.Sword1.csproj diff --git a/NScumm.Sword1/ObjectMan.cs b/Src/NScumm.Sword1/ObjectMan.cs similarity index 100% rename from NScumm.Sword1/ObjectMan.cs rename to Src/NScumm.Sword1/ObjectMan.cs diff --git a/NScumm.Sword1/Properties/AssemblyInfo.cs b/Src/NScumm.Sword1/Properties/AssemblyInfo.cs similarity index 100% rename from NScumm.Sword1/Properties/AssemblyInfo.cs rename to Src/NScumm.Sword1/Properties/AssemblyInfo.cs diff --git a/NScumm.Sword1/RawAccess.cs b/Src/NScumm.Sword1/RawAccess.cs similarity index 100% rename from NScumm.Sword1/RawAccess.cs rename to Src/NScumm.Sword1/RawAccess.cs diff --git a/NScumm.Sword1/ResMan.cs b/Src/NScumm.Sword1/ResMan.cs similarity index 100% rename from NScumm.Sword1/ResMan.cs rename to Src/NScumm.Sword1/ResMan.cs diff --git a/NScumm.Sword1/Router.cs b/Src/NScumm.Sword1/Router.cs similarity index 100% rename from NScumm.Sword1/Router.cs rename to Src/NScumm.Sword1/Router.cs diff --git a/NScumm.Sword1/Screen.cs b/Src/NScumm.Sword1/Screen.cs similarity index 100% rename from NScumm.Sword1/Screen.cs rename to Src/NScumm.Sword1/Screen.cs diff --git a/NScumm.Sword1/ScriptVariableNames.cs b/Src/NScumm.Sword1/ScriptVariableNames.cs similarity index 100% rename from NScumm.Sword1/ScriptVariableNames.cs rename to Src/NScumm.Sword1/ScriptVariableNames.cs diff --git a/NScumm.Sword1/Sound.Defines.cs b/Src/NScumm.Sword1/Sound.Defines.cs similarity index 100% rename from NScumm.Sword1/Sound.Defines.cs rename to Src/NScumm.Sword1/Sound.Defines.cs diff --git a/NScumm.Sword1/Sound.Fx.cs b/Src/NScumm.Sword1/Sound.Fx.cs similarity index 100% rename from NScumm.Sword1/Sound.Fx.cs rename to Src/NScumm.Sword1/Sound.Fx.cs diff --git a/NScumm.Sword1/Sound.cs b/Src/NScumm.Sword1/Sound.cs similarity index 100% rename from NScumm.Sword1/Sound.cs rename to Src/NScumm.Sword1/Sound.cs diff --git a/NScumm.Sword1/StaticRes.cs b/Src/NScumm.Sword1/StaticRes.cs similarity index 100% rename from NScumm.Sword1/StaticRes.cs rename to Src/NScumm.Sword1/StaticRes.cs diff --git a/NScumm.Sword1/Sword1MetaEngine.cs b/Src/NScumm.Sword1/Sword1MetaEngine.cs similarity index 100% rename from NScumm.Sword1/Sword1MetaEngine.cs rename to Src/NScumm.Sword1/Sword1MetaEngine.cs diff --git a/NScumm.Sword1/SwordEngine.cs b/Src/NScumm.Sword1/SwordEngine.cs similarity index 100% rename from NScumm.Sword1/SwordEngine.cs rename to Src/NScumm.Sword1/SwordEngine.cs diff --git a/NScumm.Sword1/SwordObject.cs b/Src/NScumm.Sword1/SwordObject.cs similarity index 100% rename from NScumm.Sword1/SwordObject.cs rename to Src/NScumm.Sword1/SwordObject.cs diff --git a/NScumm.Sword1/SwordRes.RoomDefTable.cs b/Src/NScumm.Sword1/SwordRes.RoomDefTable.cs similarity index 100% rename from NScumm.Sword1/SwordRes.RoomDefTable.cs rename to Src/NScumm.Sword1/SwordRes.RoomDefTable.cs diff --git a/NScumm.Sword1/SwordSystem.cs b/Src/NScumm.Sword1/SwordSystem.cs similarity index 100% rename from NScumm.Sword1/SwordSystem.cs rename to Src/NScumm.Sword1/SwordSystem.cs diff --git a/NScumm.Sword1/SystemVars.cs b/Src/NScumm.Sword1/SystemVars.cs similarity index 100% rename from NScumm.Sword1/SystemVars.cs rename to Src/NScumm.Sword1/SystemVars.cs diff --git a/NScumm.Sword1/Text.cs b/Src/NScumm.Sword1/Text.cs similarity index 100% rename from NScumm.Sword1/Text.cs rename to Src/NScumm.Sword1/Text.cs diff --git a/NScumm.Sword1/swordres.cs b/Src/NScumm.Sword1/swordres.cs similarity index 100% rename from NScumm.Sword1/swordres.cs rename to Src/NScumm.Sword1/swordres.cs diff --git a/NScumm.Sword1/swordres.h b/Src/NScumm.Sword1/swordres.h similarity index 100% rename from NScumm.Sword1/swordres.h rename to Src/NScumm.Sword1/swordres.h diff --git a/NScumm.Sword1/swordres.tt b/Src/NScumm.Sword1/swordres.tt similarity index 100% rename from NScumm.Sword1/swordres.tt rename to Src/NScumm.Sword1/swordres.tt diff --git a/NScumm.UWP/App.xaml b/Src/NScumm.UWP/App.xaml similarity index 100% rename from NScumm.UWP/App.xaml rename to Src/NScumm.UWP/App.xaml diff --git a/NScumm.UWP/App.xaml.cs b/Src/NScumm.UWP/App.xaml.cs similarity index 88% rename from NScumm.UWP/App.xaml.cs rename to Src/NScumm.UWP/App.xaml.cs index d17f169..bed28ce 100644 --- a/NScumm.UWP/App.xaml.cs +++ b/Src/NScumm.UWP/App.xaml.cs @@ -1,4 +1,6 @@ -using NScumm.Core; +// App.xaml.cs + +using NScumm.Core; using NScumm.Platform_UWP; using System; using System.Diagnostics; @@ -39,15 +41,15 @@ public App() bool result = MemoryManager.TrySetAppMemoryUsageLimit(y + 100000000); } } - catch (Exception e) + catch (Exception ex) { - Debug.WriteLine("!! Exception (app.xaml) !!" + e.Message); + Debug.WriteLine("[ex] (App.xaml...) : " + ex.Message); } } - catch + catch (Exception ex2) { - + Debug.WriteLine("[ex2] (App.xaml...) : " + ex2.Message); } InitializeComponent(); @@ -183,31 +185,37 @@ private void OnUnhandledException(object sender, Windows.UI.Xaml.UnhandledExcept if (e != null) { Exception exception = e.Exception; - if ((exception is XmlException || exception is NullReferenceException) && exception.ToString().ToUpper().Contains("INNERACTIVE")) + if ((exception is XmlException || exception is NullReferenceException) + && exception.ToString().ToUpper().Contains("INNERACTIVE")) { Debug.WriteLine("Handled Inneractive exception {0}", exception); e.Handled = true; return; } - else if (exception is NullReferenceException && exception.ToString().ToUpper().Contains("SOMA")) + else if (exception is NullReferenceException + && exception.ToString().ToUpper().Contains("SOMA")) { Debug.WriteLine("Handled Smaato null reference exception {0}", exception); e.Handled = true; return; } - else if ((exception is System.IO.IOException || exception is NullReferenceException) && exception.ToString().ToUpper().Contains("GOOGLE")) + else if ((exception is System.IO.IOException || exception + is NullReferenceException) && exception.ToString().ToUpper().Contains("GOOGLE")) { Debug.WriteLine("Handled Google exception {0}", exception); e.Handled = true; return; } - else if (exception is ObjectDisposedException && exception.ToString().ToUpper().Contains("MOBFOX")) + else if (exception is ObjectDisposedException + && exception.ToString().ToUpper().Contains("MOBFOX")) { Debug.WriteLine("Handled Mobfox exception {0}", exception); e.Handled = true; return; } - else if ((exception is NullReferenceException || exception is XamlParseException || exception is TypeLoadException) && exception.ToString().ToUpper().Contains("MICROSOFT.ADVERTISING")) + else if ((exception is NullReferenceException + || exception is XamlParseException || exception is TypeLoadException) + && exception.ToString().ToUpper().Contains("MICROSOFT.ADVERTISING")) { Debug.WriteLine("Handled Microsoft.Advertising exception {0}", exception); e.Handled = true; diff --git a/NScumm.UWP/ApplicationInsights.config b/Src/NScumm.UWP/ApplicationInsights.config similarity index 100% rename from NScumm.UWP/ApplicationInsights.config rename to Src/NScumm.UWP/ApplicationInsights.config diff --git a/NScumm.UWP/Assets/LargeTile.scale-100.png b/Src/NScumm.UWP/Assets/LargeTile.scale-100.png similarity index 100% rename from NScumm.UWP/Assets/LargeTile.scale-100.png rename to Src/NScumm.UWP/Assets/LargeTile.scale-100.png diff --git a/NScumm.UWP/Assets/LargeTile.scale-125.png b/Src/NScumm.UWP/Assets/LargeTile.scale-125.png similarity index 100% rename from NScumm.UWP/Assets/LargeTile.scale-125.png rename to Src/NScumm.UWP/Assets/LargeTile.scale-125.png diff --git a/NScumm.UWP/Assets/LargeTile.scale-150.png b/Src/NScumm.UWP/Assets/LargeTile.scale-150.png similarity index 100% rename from NScumm.UWP/Assets/LargeTile.scale-150.png rename to Src/NScumm.UWP/Assets/LargeTile.scale-150.png diff --git a/NScumm.UWP/Assets/LargeTile.scale-200.png b/Src/NScumm.UWP/Assets/LargeTile.scale-200.png similarity index 100% rename from NScumm.UWP/Assets/LargeTile.scale-200.png rename to Src/NScumm.UWP/Assets/LargeTile.scale-200.png diff --git a/NScumm.UWP/Assets/LargeTile.scale-400.png b/Src/NScumm.UWP/Assets/LargeTile.scale-400.png similarity index 100% rename from NScumm.UWP/Assets/LargeTile.scale-400.png rename to Src/NScumm.UWP/Assets/LargeTile.scale-400.png diff --git a/NScumm.UWP/Assets/LockScreenLogo.scale-200.png b/Src/NScumm.UWP/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from NScumm.UWP/Assets/LockScreenLogo.scale-200.png rename to Src/NScumm.UWP/Assets/LockScreenLogo.scale-200.png diff --git a/NScumm.UWP/Assets/SmallTile.scale-100.png b/Src/NScumm.UWP/Assets/SmallTile.scale-100.png similarity index 100% rename from NScumm.UWP/Assets/SmallTile.scale-100.png rename to Src/NScumm.UWP/Assets/SmallTile.scale-100.png diff --git a/NScumm.UWP/Assets/SmallTile.scale-125.png b/Src/NScumm.UWP/Assets/SmallTile.scale-125.png similarity index 100% rename from NScumm.UWP/Assets/SmallTile.scale-125.png rename to Src/NScumm.UWP/Assets/SmallTile.scale-125.png diff --git a/NScumm.UWP/Assets/SmallTile.scale-150.png b/Src/NScumm.UWP/Assets/SmallTile.scale-150.png similarity index 100% rename from NScumm.UWP/Assets/SmallTile.scale-150.png rename to Src/NScumm.UWP/Assets/SmallTile.scale-150.png diff --git a/NScumm.UWP/Assets/SmallTile.scale-200.png b/Src/NScumm.UWP/Assets/SmallTile.scale-200.png similarity index 100% rename from NScumm.UWP/Assets/SmallTile.scale-200.png rename to Src/NScumm.UWP/Assets/SmallTile.scale-200.png diff --git a/NScumm.UWP/Assets/SmallTile.scale-400.png b/Src/NScumm.UWP/Assets/SmallTile.scale-400.png similarity index 100% rename from NScumm.UWP/Assets/SmallTile.scale-400.png rename to Src/NScumm.UWP/Assets/SmallTile.scale-400.png diff --git a/NScumm.UWP/Assets/SplashScreen.scale-100.png b/Src/NScumm.UWP/Assets/SplashScreen.scale-100.png similarity index 100% rename from NScumm.UWP/Assets/SplashScreen.scale-100.png rename to Src/NScumm.UWP/Assets/SplashScreen.scale-100.png diff --git a/NScumm.UWP/Assets/SplashScreen.scale-125.png b/Src/NScumm.UWP/Assets/SplashScreen.scale-125.png similarity index 100% rename from NScumm.UWP/Assets/SplashScreen.scale-125.png rename to Src/NScumm.UWP/Assets/SplashScreen.scale-125.png diff --git a/NScumm.UWP/Assets/SplashScreen.scale-150.png b/Src/NScumm.UWP/Assets/SplashScreen.scale-150.png similarity index 100% rename from NScumm.UWP/Assets/SplashScreen.scale-150.png rename to Src/NScumm.UWP/Assets/SplashScreen.scale-150.png diff --git a/NScumm.UWP/Assets/SplashScreen.scale-200.png b/Src/NScumm.UWP/Assets/SplashScreen.scale-200.png similarity index 100% rename from NScumm.UWP/Assets/SplashScreen.scale-200.png rename to Src/NScumm.UWP/Assets/SplashScreen.scale-200.png diff --git a/NScumm.UWP/Assets/SplashScreen.scale-400.png b/Src/NScumm.UWP/Assets/SplashScreen.scale-400.png similarity index 100% rename from NScumm.UWP/Assets/SplashScreen.scale-400.png rename to Src/NScumm.UWP/Assets/SplashScreen.scale-400.png diff --git a/NScumm.UWP/Assets/Square150x150Logo.scale-100.png b/Src/NScumm.UWP/Assets/Square150x150Logo.scale-100.png similarity index 100% rename from NScumm.UWP/Assets/Square150x150Logo.scale-100.png rename to Src/NScumm.UWP/Assets/Square150x150Logo.scale-100.png diff --git a/NScumm.UWP/Assets/Square150x150Logo.scale-125.png b/Src/NScumm.UWP/Assets/Square150x150Logo.scale-125.png similarity index 100% rename from NScumm.UWP/Assets/Square150x150Logo.scale-125.png rename to Src/NScumm.UWP/Assets/Square150x150Logo.scale-125.png diff --git a/NScumm.UWP/Assets/Square150x150Logo.scale-150.png b/Src/NScumm.UWP/Assets/Square150x150Logo.scale-150.png similarity index 100% rename from NScumm.UWP/Assets/Square150x150Logo.scale-150.png rename to Src/NScumm.UWP/Assets/Square150x150Logo.scale-150.png diff --git a/NScumm.UWP/Assets/Square150x150Logo.scale-200.png b/Src/NScumm.UWP/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from NScumm.UWP/Assets/Square150x150Logo.scale-200.png rename to Src/NScumm.UWP/Assets/Square150x150Logo.scale-200.png diff --git a/NScumm.UWP/Assets/Square150x150Logo.scale-400.png b/Src/NScumm.UWP/Assets/Square150x150Logo.scale-400.png similarity index 100% rename from NScumm.UWP/Assets/Square150x150Logo.scale-400.png rename to Src/NScumm.UWP/Assets/Square150x150Logo.scale-400.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-32.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-32.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-32.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Src/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.scale-100.png b/Src/NScumm.UWP/Assets/Square44x44Logo.scale-100.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.scale-100.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.scale-100.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.scale-125.png b/Src/NScumm.UWP/Assets/Square44x44Logo.scale-125.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.scale-125.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.scale-125.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.scale-150.png b/Src/NScumm.UWP/Assets/Square44x44Logo.scale-150.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.scale-150.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.scale-150.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.scale-200.png b/Src/NScumm.UWP/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.scale-200.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.scale-200.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.scale-400.png b/Src/NScumm.UWP/Assets/Square44x44Logo.scale-400.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.scale-400.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.scale-400.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.targetsize-16.png b/Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-16.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.targetsize-16.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-16.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.targetsize-24.png b/Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-24.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.targetsize-24.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-24.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.targetsize-256.png b/Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-256.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.targetsize-256.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-256.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.targetsize-32.png b/Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-32.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.targetsize-32.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-32.png diff --git a/NScumm.UWP/Assets/Square44x44Logo.targetsize-48.png b/Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-48.png similarity index 100% rename from NScumm.UWP/Assets/Square44x44Logo.targetsize-48.png rename to Src/NScumm.UWP/Assets/Square44x44Logo.targetsize-48.png diff --git a/NScumm.UWP/Assets/StoreLogo.scale-100.png b/Src/NScumm.UWP/Assets/StoreLogo.scale-100.png similarity index 100% rename from NScumm.UWP/Assets/StoreLogo.scale-100.png rename to Src/NScumm.UWP/Assets/StoreLogo.scale-100.png diff --git a/NScumm.UWP/Assets/StoreLogo.scale-125.png b/Src/NScumm.UWP/Assets/StoreLogo.scale-125.png similarity index 100% rename from NScumm.UWP/Assets/StoreLogo.scale-125.png rename to Src/NScumm.UWP/Assets/StoreLogo.scale-125.png diff --git a/NScumm.UWP/Assets/StoreLogo.scale-150.png b/Src/NScumm.UWP/Assets/StoreLogo.scale-150.png similarity index 100% rename from NScumm.UWP/Assets/StoreLogo.scale-150.png rename to Src/NScumm.UWP/Assets/StoreLogo.scale-150.png diff --git a/NScumm.UWP/Assets/StoreLogo.scale-200.png b/Src/NScumm.UWP/Assets/StoreLogo.scale-200.png similarity index 100% rename from NScumm.UWP/Assets/StoreLogo.scale-200.png rename to Src/NScumm.UWP/Assets/StoreLogo.scale-200.png diff --git a/NScumm.UWP/Assets/StoreLogo.scale-400.png b/Src/NScumm.UWP/Assets/StoreLogo.scale-400.png similarity index 100% rename from NScumm.UWP/Assets/StoreLogo.scale-400.png rename to Src/NScumm.UWP/Assets/StoreLogo.scale-400.png diff --git a/NScumm.UWP/Assets/Wide310x150Logo.scale-100.png b/Src/NScumm.UWP/Assets/Wide310x150Logo.scale-100.png similarity index 100% rename from NScumm.UWP/Assets/Wide310x150Logo.scale-100.png rename to Src/NScumm.UWP/Assets/Wide310x150Logo.scale-100.png diff --git a/NScumm.UWP/Assets/Wide310x150Logo.scale-125.png b/Src/NScumm.UWP/Assets/Wide310x150Logo.scale-125.png similarity index 100% rename from NScumm.UWP/Assets/Wide310x150Logo.scale-125.png rename to Src/NScumm.UWP/Assets/Wide310x150Logo.scale-125.png diff --git a/NScumm.UWP/Assets/Wide310x150Logo.scale-150.png b/Src/NScumm.UWP/Assets/Wide310x150Logo.scale-150.png similarity index 100% rename from NScumm.UWP/Assets/Wide310x150Logo.scale-150.png rename to Src/NScumm.UWP/Assets/Wide310x150Logo.scale-150.png diff --git a/NScumm.UWP/Assets/Wide310x150Logo.scale-200.png b/Src/NScumm.UWP/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from NScumm.UWP/Assets/Wide310x150Logo.scale-200.png rename to Src/NScumm.UWP/Assets/Wide310x150Logo.scale-200.png diff --git a/NScumm.UWP/Assets/Wide310x150Logo.scale-400.png b/Src/NScumm.UWP/Assets/Wide310x150Logo.scale-400.png similarity index 100% rename from NScumm.UWP/Assets/Wide310x150Logo.scale-400.png rename to Src/NScumm.UWP/Assets/Wide310x150Logo.scale-400.png diff --git a/NScumm.UWP/Content/Fonts/MenuFont.xnb b/Src/NScumm.UWP/Content/Fonts/MenuFont.xnb similarity index 100% rename from NScumm.UWP/Content/Fonts/MenuFont.xnb rename to Src/NScumm.UWP/Content/Fonts/MenuFont.xnb diff --git a/NScumm.UWP/Content/Fonts/SpriteFont.xnb b/Src/NScumm.UWP/Content/Fonts/SpriteFont.xnb similarity index 100% rename from NScumm.UWP/Content/Fonts/SpriteFont.xnb rename to Src/NScumm.UWP/Content/Fonts/SpriteFont.xnb diff --git a/NScumm.UWP/Content/NScumm.mgcb b/Src/NScumm.UWP/Content/NScumm.mgcb similarity index 100% rename from NScumm.UWP/Content/NScumm.mgcb rename to Src/NScumm.UWP/Content/NScumm.mgcb diff --git a/NScumm.UWP/Content/ScummVM.dat b/Src/NScumm.UWP/Content/ScummVM.dat similarity index 100% rename from NScumm.UWP/Content/ScummVM.dat rename to Src/NScumm.UWP/Content/ScummVM.dat diff --git a/NScumm.UWP/Content/Textures/blank.png b/Src/NScumm.UWP/Content/Textures/blank.png similarity index 100% rename from NScumm.UWP/Content/Textures/blank.png rename to Src/NScumm.UWP/Content/Textures/blank.png diff --git a/NScumm.UWP/Content/Textures/blank.xnb b/Src/NScumm.UWP/Content/Textures/blank.xnb similarity index 100% rename from NScumm.UWP/Content/Textures/blank.xnb rename to Src/NScumm.UWP/Content/Textures/blank.xnb diff --git a/NScumm.UWP/Converters/GameCountToVisibilityConverter.cs b/Src/NScumm.UWP/Converters/GameCountToVisibilityConverter.cs similarity index 100% rename from NScumm.UWP/Converters/GameCountToVisibilityConverter.cs rename to Src/NScumm.UWP/Converters/GameCountToVisibilityConverter.cs diff --git a/NScumm.UWP/Converters/IsScanningToVisibilityConverter.cs b/Src/NScumm.UWP/Converters/IsScanningToVisibilityConverter.cs similarity index 100% rename from NScumm.UWP/Converters/IsScanningToVisibilityConverter.cs rename to Src/NScumm.UWP/Converters/IsScanningToVisibilityConverter.cs diff --git a/NScumm.UWP/DynamicSoundEffectInstance.cs b/Src/NScumm.UWP/DynamicSoundEffectInstance.cs similarity index 100% rename from NScumm.UWP/DynamicSoundEffectInstance.cs rename to Src/NScumm.UWP/DynamicSoundEffectInstance.cs diff --git a/NScumm.UWP/Mono.Options/Options.cs b/Src/NScumm.UWP/Mono.Options/Options.cs similarity index 100% rename from NScumm.UWP/Mono.Options/Options.cs rename to Src/NScumm.UWP/Mono.Options/Options.cs diff --git a/NScumm.UWP/NScumm.UWP.csproj b/Src/NScumm.UWP/NScumm.UWP.csproj similarity index 87% rename from NScumm.UWP/NScumm.UWP.csproj rename to Src/NScumm.UWP/NScumm.UWP.csproj index 93d834e..ae42d5d 100644 --- a/NScumm.UWP/NScumm.UWP.csproj +++ b/Src/NScumm.UWP/NScumm.UWP.csproj @@ -21,8 +21,8 @@ False - x86|x64|arm - Never + arm + Auto False SHA256 True @@ -109,110 +109,24 @@ true - - - Content\Nscumm.xml - - - Content\Textures\blank.png - PreserveNewest - - - PreserveNewest - - - Content\Fonts\MenuFont.xnb - PreserveNewest - - - Content\Fonts\SpriteFont.xnb - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - + + MSBuild:Compile Designer - + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + - - ScreenManager\GameScreen.cs - - - ScreenManager\InputState.cs - - - ScreenManager\MenuScreen.cs - - - ScreenManager\ScreenManager.cs - - - Screens\BackgroundScreen.cs - - - Screens\ScummScreen.cs - - - ScummGame.cs - - - Services\IMenuService.cs - - - XnaGraphicsManager.cs - - - XnaInputManager.cs - App.xaml @@ -228,6 +142,15 @@ MainMenu.xaml + + + + + + + + + @@ -236,6 +159,8 @@ + + @@ -243,6 +168,13 @@ + + Content\Nscumm.xml + Always + + + Always + @@ -251,24 +183,6 @@ - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - {97342112-448a-4636-827f-8d47b226d86f} @@ -344,26 +258,97 @@ - - PreserveNewest - + + Always + + + Always + + + Always + + + Always + + + Always + - - - - + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + + Designer + + + Designer + + + Designer + 14.0 + Other similar extension points exist, see Microsoft.Common.targets. - + --> \ No newline at end of file diff --git a/Src/NScumm.UWP/NScumm.UWP.csproj.backup b/Src/NScumm.UWP/NScumm.UWP.csproj.backup new file mode 100644 index 0000000..5884da1 --- /dev/null +++ b/Src/NScumm.UWP/NScumm.UWP.csproj.backup @@ -0,0 +1,395 @@ + + + + + Debug + x86 + {74ED9AF5-716F-48A7-97A5-FCDB51C6F950} + AppContainerExe + Properties + NScumm.MonoGame + NScumm.UWP + en-US + UAP + 10.0.19041.0 + 10.0.10240.0 + 14 + true + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + NScummUWP_TemporaryKey.pfx + + + False + arm + Auto + False + SHA256 + True + 0 + win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot + False + 0 + OnApplicationRun + 11.0 + + + true + ..\bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + true + + + ..\bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + false + true + + + true + ..\bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + true + true + + + ..\bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + false + ;2008 + pdbonly + x64 + false + prompt + true + true + true + + + true + ..\bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + true + + + ..\bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + true + + + + + Content\Nscumm.xml + + + Content\Textures\blank.png + PreserveNewest + + + PreserveNewest + + + Content\Fonts\MenuFont.xnb + PreserveNewest + + + Content\Fonts\SpriteFont.xnb + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + Designer + + + + + ScreenManager\GameScreen.cs + + + + ScreenManager\InputState.cs + + + + ScreenManager\MenuScreen.cs + + + + ScreenManager\ScreenManager.cs + + + + Screens\BackgroundScreen.cs + + + + Screens\ScummScreen.cs + + + + + + Services\IMenuService.cs + + + + XnaGraphicsManager.cs + + + + XnaInputManager.cs + + + + App.xaml + + + + + + + + + GamePage.xaml + + + GameLibraryPage.xaml + + + MainMenu.xaml + + + + + + + + + + + + + + + + Designer + + + + + + + + + + + + + + MSBuild:Compile + Designer + + + + MSBuild:Compile + Designer + + + + MSBuild:Compile + Designer + + + + Designer + MSBuild:Compile + + + + + + {97342112-448a-4636-827f-8d47b226d86f} + NScumm.Scumm + + + {8740a0cd-2613-4354-9506-35035a735962} + NScumm.Sky + + + {ef539a3f-0672-412c-b9d0-38dcd3622d99} + NScumm.Sword1 + + + {8e7a9e5b-d7eb-4da1-8ee7-a5d8de202372} + NScumm.Core + + + {f8002a61-23cf-4b47-9561-830f18aff6f1} + NScumm.Platform_UWP + + + + + + Visual C++ 2015 Runtime for Universal Windows Platform Apps + + + Windows Mobile Extensions for the UWP + + + + + 6.2.8 + + + 3.5.0.1678 + + + 14332.0.2 + + + 1.0.5 + + + 2.2.5 + + + 2.2.5 + + + 2.2.5 + + + 0.10.0 + + + 3.0.0 + + + 3.0.0 + + + 3.0.0 + + + 3.0.0 + + + 3.0.0 + + + 3.0.0 + + + + + + PreserveNewest + + + + + + + + + + + + 14.0 + + + + + + + \ No newline at end of file diff --git a/NScumm.UWP/NScumm.MonoGame.rd.xml b/Src/NScumm.UWP/NScumm.UWP.rd.xml similarity index 100% rename from NScumm.UWP/NScumm.MonoGame.rd.xml rename to Src/NScumm.UWP/NScumm.UWP.rd.xml diff --git a/NScumm.UWP/NScummUWP_TemporaryKey.pfx b/Src/NScumm.UWP/NScummUWP_TemporaryKey.pfx similarity index 100% rename from NScumm.UWP/NScummUWP_TemporaryKey.pfx rename to Src/NScumm.UWP/NScummUWP_TemporaryKey.pfx diff --git a/NScumm.UWP/NativeArchiveHelper.cs b/Src/NScumm.UWP/NativeArchiveHelper.cs similarity index 99% rename from NScumm.UWP/NativeArchiveHelper.cs rename to Src/NScumm.UWP/NativeArchiveHelper.cs index 2cef10b..5093449 100644 --- a/NScumm.UWP/NativeArchiveHelper.cs +++ b/Src/NScumm.UWP/NativeArchiveHelper.cs @@ -1,4 +1,6 @@ -using System; +// NativeArchiveHelper.cs + +using System; using System.Collections.Generic; using System.ComponentModel; using System.IO; diff --git a/NScumm.UWP/OpenALDriver.cs b/Src/NScumm.UWP/OpenALDriver.cs similarity index 100% rename from NScumm.UWP/OpenALDriver.cs rename to Src/NScumm.UWP/OpenALDriver.cs diff --git a/Src/NScumm.UWP/Package.appxmanifest b/Src/NScumm.UWP/Package.appxmanifest new file mode 100644 index 0000000..4d7fad1 --- /dev/null +++ b/Src/NScumm.UWP/Package.appxmanifest @@ -0,0 +1,241 @@ + + + + + + NSCUMM 1.2.2 + mediaexplorer + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .fla + + + + + + + .smk + + + + + + + .clm + + + + + + + .clu + + + + + + + .clf + + + + + + + .rif + + + + + + + .dnr + + + + + + + .sou + + + + + + + .sm0 + + + + + + + .iq + + + + + + + .dsk + + + + + + + .d64 + + + + + + Scumm Index File + + .lfl + + + + + + + .la0 + + + + + + + .la1 + + + + + + + .la2 + + + + + + + .000 + + + + + + + .001 + + + + + + + .lec + + + + + + + .rip + + + + + + + .flu + + + + + + + .trs + + + + + + + .tab + + + + + + + .san + + + + + + + .nut + + + + + + + .bun + + + + + + eXtensible Markup Language + eXtensible Markup Language + + .xml + + + + + + + .sav + + + + + + + + + + + + \ No newline at end of file diff --git a/NScumm.UWP/Package.appxmanifest b/Src/NScumm.UWP/Package.appxmanifest_backup similarity index 100% rename from NScumm.UWP/Package.appxmanifest rename to Src/NScumm.UWP/Package.appxmanifest_backup diff --git a/NScumm.UWP/Pages/GameLibraryPage.xaml b/Src/NScumm.UWP/Pages/GameLibraryPage.xaml similarity index 100% rename from NScumm.UWP/Pages/GameLibraryPage.xaml rename to Src/NScumm.UWP/Pages/GameLibraryPage.xaml diff --git a/NScumm.UWP/Pages/GameLibraryPage.xaml.cs b/Src/NScumm.UWP/Pages/GameLibraryPage.xaml.cs similarity index 98% rename from NScumm.UWP/Pages/GameLibraryPage.xaml.cs rename to Src/NScumm.UWP/Pages/GameLibraryPage.xaml.cs index 306ac85..95717e8 100644 --- a/NScumm.UWP/Pages/GameLibraryPage.xaml.cs +++ b/Src/NScumm.UWP/Pages/GameLibraryPage.xaml.cs @@ -1,4 +1,6 @@ -using System.Diagnostics; +// GameLibraryPage.xaml.cs + +using System.Diagnostics; using NScumm.MonoGame.Converters; using NScumm.MonoGame.ViewModels; using Windows.UI.Xaml; @@ -62,7 +64,7 @@ public static string GetAppVersion() } catch (Exception ex) { - + Debug.WriteLine("[ex] " + ex.Message); } return "1.0.0.0"; } diff --git a/NScumm.UWP/Pages/GamePage.xaml b/Src/NScumm.UWP/Pages/GamePage.xaml similarity index 100% rename from NScumm.UWP/Pages/GamePage.xaml rename to Src/NScumm.UWP/Pages/GamePage.xaml diff --git a/NScumm.UWP/Pages/GamePage.xaml.cs b/Src/NScumm.UWP/Pages/GamePage.xaml.cs similarity index 97% rename from NScumm.UWP/Pages/GamePage.xaml.cs rename to Src/NScumm.UWP/Pages/GamePage.xaml.cs index 5e0ccd8..924857d 100644 --- a/NScumm.UWP/Pages/GamePage.xaml.cs +++ b/Src/NScumm.UWP/Pages/GamePage.xaml.cs @@ -1,4 +1,6 @@ -using MonoGame.Framework; +// GamePage.xaml.cs + +using MonoGame.Framework; using NScumm.Core.IO; using Windows.UI.Xaml; using Windows.UI.Xaml.Navigation; @@ -19,6 +21,7 @@ using NotificationsVisualizerLibrary; using Windows.UI.Notifications; using NotificationsExtensions.Tiles; +using System.Diagnostics; namespace NScumm.MonoGame { @@ -40,16 +43,18 @@ public GamePage() var currentView = SystemNavigationManager.GetForCurrentView(); currentView.AppViewBackButtonVisibility = AppViewBackButtonVisibility.Visible; } - catch (Exception e) + catch (Exception ex) { + Debug.WriteLine("[ex] (GamePage) : " + ex.Message); } + try { _menuService = new MenuService(Dispatcher); } catch (Exception ex) { - + Debug.WriteLine("[ex] (GamePage) : " + ex.Message); } ShowTileHandler += ShowTileHandlerCall; FPSHandler += FPSHandlerCall; @@ -94,9 +99,9 @@ private void callFPSTimer(bool startState = false) null, 0, 1000); } } - catch (Exception e) + catch (Exception ex) { - + Debug.WriteLine("[ex] (GamePage) : " + ex.Message); } } public async void UpdateFPSCounter(object sender, EventArgs e) @@ -111,13 +116,13 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio } catch (Exception ex) { - + Debug.WriteLine("[ex] (GamePage) : " + ex.Message); } }); } catch (Exception ex) { - + Debug.WriteLine("[ex] (GamePage) : " + ex.Message); } } private void FPSHandlerCall(object sender, EventArgs args) @@ -137,7 +142,7 @@ private void ShowTileHandlerCall(object sender, EventArgs args) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GamePage) : " + ex.Message); } } @@ -156,7 +161,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e) } catch (Exception ex) { - + Debug.WriteLine("[ex] (GamePage) : " + ex.Message); } SavesBar.Visibility = Visibility.Collapsed; } diff --git a/NScumm.UWP/Pages/MainMenu.xaml b/Src/NScumm.UWP/Pages/MainMenu.xaml similarity index 100% rename from NScumm.UWP/Pages/MainMenu.xaml rename to Src/NScumm.UWP/Pages/MainMenu.xaml diff --git a/NScumm.UWP/Pages/MainMenu.xaml.cs b/Src/NScumm.UWP/Pages/MainMenu.xaml.cs similarity index 100% rename from NScumm.UWP/Pages/MainMenu.xaml.cs rename to Src/NScumm.UWP/Pages/MainMenu.xaml.cs diff --git a/NScumm.UWP/Program.cs b/Src/NScumm.UWP/Program.cs similarity index 100% rename from NScumm.UWP/Program.cs rename to Src/NScumm.UWP/Program.cs diff --git a/NScumm.UWP/Properties/AssemblyInfo.cs b/Src/NScumm.UWP/Properties/AssemblyInfo.cs similarity index 91% rename from NScumm.UWP/Properties/AssemblyInfo.cs rename to Src/NScumm.UWP/Properties/AssemblyInfo.cs index 1b36ff1..73ff366 100644 --- a/NScumm.UWP/Properties/AssemblyInfo.cs +++ b/Src/NScumm.UWP/Properties/AssemblyInfo.cs @@ -23,6 +23,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.1.0")] -[assembly: AssemblyFileVersion("1.2.1.0")] +[assembly: AssemblyVersion("1.2.2.0")] +[assembly: AssemblyFileVersion("1.2.2.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/NScumm.UWP/Properties/Default.rd.xml b/Src/NScumm.UWP/Properties/Default.rd.xml similarity index 100% rename from NScumm.UWP/Properties/Default.rd.xml rename to Src/NScumm.UWP/Properties/Default.rd.xml diff --git a/NScumm.UWP/ScreenManager/GameScreen.cs b/Src/NScumm.UWP/ScreenManager/GameScreen.cs similarity index 100% rename from NScumm.UWP/ScreenManager/GameScreen.cs rename to Src/NScumm.UWP/ScreenManager/GameScreen.cs diff --git a/NScumm.UWP/ScreenManager/InputState.cs b/Src/NScumm.UWP/ScreenManager/InputState.cs similarity index 100% rename from NScumm.UWP/ScreenManager/InputState.cs rename to Src/NScumm.UWP/ScreenManager/InputState.cs diff --git a/NScumm.UWP/ScreenManager/MenuScreen.cs b/Src/NScumm.UWP/ScreenManager/MenuScreen.cs similarity index 100% rename from NScumm.UWP/ScreenManager/MenuScreen.cs rename to Src/NScumm.UWP/ScreenManager/MenuScreen.cs diff --git a/NScumm.UWP/ScreenManager/ScreenManager.cs b/Src/NScumm.UWP/ScreenManager/ScreenManager.cs similarity index 100% rename from NScumm.UWP/ScreenManager/ScreenManager.cs rename to Src/NScumm.UWP/ScreenManager/ScreenManager.cs diff --git a/NScumm.UWP/Screens/BackgroundScreen.cs b/Src/NScumm.UWP/Screens/BackgroundScreen.cs similarity index 100% rename from NScumm.UWP/Screens/BackgroundScreen.cs rename to Src/NScumm.UWP/Screens/BackgroundScreen.cs diff --git a/NScumm.UWP/Screens/MainMenuScreen.cs b/Src/NScumm.UWP/Screens/MainMenuScreen.cs similarity index 100% rename from NScumm.UWP/Screens/MainMenuScreen.cs rename to Src/NScumm.UWP/Screens/MainMenuScreen.cs diff --git a/NScumm.UWP/Screens/ScummScreen.cs b/Src/NScumm.UWP/Screens/ScummScreen.cs similarity index 100% rename from NScumm.UWP/Screens/ScummScreen.cs rename to Src/NScumm.UWP/Screens/ScummScreen.cs diff --git a/NScumm.UWP/ScummGame.cs b/Src/NScumm.UWP/ScummGame.cs similarity index 79% rename from NScumm.UWP/ScummGame.cs rename to Src/NScumm.UWP/ScummGame.cs index 477b379..b780741 100644 --- a/NScumm.UWP/ScummGame.cs +++ b/Src/NScumm.UWP/ScummGame.cs @@ -1,19 +1,6 @@ -/* - * This file is part of NScumm. - * - * NScumm is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * NScumm is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with NScumm. If not, see . - */ +// ScummGame.cs +// This file is part of NScumm. + using Microsoft.Xna.Framework; using NScumm.Core.IO; diff --git a/Src/NScumm.UWP/Services/IMenuService.cs b/Src/NScumm.UWP/Services/IMenuService.cs new file mode 100644 index 0000000..7d669a5 --- /dev/null +++ b/Src/NScumm.UWP/Services/IMenuService.cs @@ -0,0 +1,14 @@ +// +// Author: +// scemino +// +// Copyright (c) 2015 + + +namespace NScumm.MonoGame.Services +{ + public interface IMenuService + { + void ShowMenu(); + } +} diff --git a/NScumm.UWP/Services/MenuService.cs b/Src/NScumm.UWP/Services/MenuService.cs similarity index 96% rename from NScumm.UWP/Services/MenuService.cs rename to Src/NScumm.UWP/Services/MenuService.cs index 86ae924..64680b6 100644 --- a/NScumm.UWP/Services/MenuService.cs +++ b/Src/NScumm.UWP/Services/MenuService.cs @@ -1,4 +1,6 @@ -using System; +// MenuService.cs + +using System; using NScumm.Core; using Windows.UI.Core; diff --git a/NScumm.UWP/Services/IMenuService.cs b/Src/NScumm.UWP/Services/_IMenuService.cs similarity index 100% rename from NScumm.UWP/Services/IMenuService.cs rename to Src/NScumm.UWP/Services/_IMenuService.cs diff --git a/NScumm.UWP/Strings/en-US/Resources.resw b/Src/NScumm.UWP/Strings/en-US/Resources.resw similarity index 100% rename from NScumm.UWP/Strings/en-US/Resources.resw rename to Src/NScumm.UWP/Strings/en-US/Resources.resw diff --git a/NScumm.UWP/Strings/fr-FR/Resources.resw b/Src/NScumm.UWP/Strings/fr-FR/Resources.resw similarity index 100% rename from NScumm.UWP/Strings/fr-FR/Resources.resw rename to Src/NScumm.UWP/Strings/fr-FR/Resources.resw diff --git a/Src/NScumm.UWP/Strings/ru-RU/Resources.resw b/Src/NScumm.UWP/Strings/ru-RU/Resources.resw new file mode 100644 index 0000000..13d66fa --- /dev/null +++ b/Src/NScumm.UWP/Strings/ru-RU/Resources.resw @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Добавить + + + {0} (Demo) + + + Библиотека игр + + + Главное меню + + + Назад + + + Выйти + + + Загрузить + + + Восстановиться + + + Сохранить + + + Загрузить + + + Сохранить + + + Главное меню + + + Новое вхождение + + + В этой библиотеке игр пока пусто. нажмите кнопку Добавить для добавления Ваших игр. + + + Сканирование игр... + + \ No newline at end of file diff --git a/NScumm.UWP/TraceFactory.cs b/Src/NScumm.UWP/TraceFactory.cs similarity index 96% rename from NScumm.UWP/TraceFactory.cs rename to Src/NScumm.UWP/TraceFactory.cs index 92dcb7e..d88cb59 100644 --- a/NScumm.UWP/TraceFactory.cs +++ b/Src/NScumm.UWP/TraceFactory.cs @@ -1,4 +1,6 @@ -using NScumm.Core; +// TraceFactory.cs + +using NScumm.Core; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/NScumm.UWP/ViewModels/DelegateCommand.cs b/Src/NScumm.UWP/ViewModels/DelegateCommand.cs similarity index 100% rename from NScumm.UWP/ViewModels/DelegateCommand.cs rename to Src/NScumm.UWP/ViewModels/DelegateCommand.cs diff --git a/NScumm.UWP/ViewModels/GameLibraryViewModel.cs b/Src/NScumm.UWP/ViewModels/GameLibraryViewModel.cs similarity index 74% rename from NScumm.UWP/ViewModels/GameLibraryViewModel.cs rename to Src/NScumm.UWP/ViewModels/GameLibraryViewModel.cs index e162255..a6affeb 100644 --- a/NScumm.UWP/ViewModels/GameLibraryViewModel.cs +++ b/Src/NScumm.UWP/ViewModels/GameLibraryViewModel.cs @@ -1,4 +1,6 @@ -//#define CLEAN_GAMELIST +// GameLibraryViewModel.cs + +//#define CLEAN_GAMELIST //#define WP_GAMES using System; @@ -41,7 +43,55 @@ public interface IGameLibraryViewModel class GameLibraryViewModel : ViewModel, IGameLibraryViewModel { - static readonly HashSet IndexFiles = new HashSet(new[] { ".0", ".1", ".2", ".3", ".5", ".6", ".8", ".16", ".25", ".99", ".101", ".102", ".418", ".455", ".512", ".scummvm", ".scumm", ".gam", ".z5", ".dat", ".blb", ".z6", ".RAW", ".ROM", ".taf", ".zblorb", ".dcp", ".(a)", ".cup", ".HE0", ".(A)", ".D$$", ".STK", ".z8", ".hex", ".VMD", ".TGA", ".ITK", ".SCN", ".INF", ".pic", ".Z5", ".z3", ".blorb", ".ulx", ".DAT", ".cas", ".PIC", ".acd", ".006", ".SYS", ".alr", ".t3", ".gblorb", ".tab", ".AP", ".CRC", ".EXE", ".z4", ".W32", ".MAC", ".mac", ".WIN", ".001", ".003", ".000", ".bin", ".exe", ".asl", ".AVD", ".INI", ".SND", ".cat", ".ANG", ".CUP", ".SYS16", ".img", ".LB", ".TLK", ".MIX", ".VQA", ".RLB", ".FNT", ".win", ".HE1", ".DMU", ".FON", ".SCR", ".TEX", ".HEP", ".DIR", ".DRV", ".MAP", ".a3c", ".GRV", ".CUR", ".OPT", ".gfx", ".ASK", ".LNG", ".ini", ".RSC", ".SPP", ".CC", ".BND", ".LA0", ".TRS", ".add", ".HRS", ".DFW", ".DR1", ".ALD", ".004", ".002", ".005", ".R02", ".R00", ".C00", ".D00", ".GAM", ".IDX", ".ogg", ".TXT", ".GRA", ".BMV", ".H$$", ".MSG", ".VGA", ".PKD", ".OUT", ".99 (PG)", ".SAV", ".PAK", ".BIN", ".CPS", ".SHP", ".DXR", ".dxr", ".gmp", ".SNG", ".C35", ".C06", ".WAV", ".SMK", ".wav", ".CAB", ".game", ".Z6", ".(b)", ".slg", ".he2", ".he1", ".HE2", ".SYN", ".PAT", ".NUT", ".nl", ".PRC", ".V56", ".SEQ", ".P56", ".AUD", ".FKR", ".EX1", ".rom", ".LIC", ".$00", ".ALL", ".LTK", ".txt", ".acx", ".VXD", ".ACX", ".mpc", ".msd", ".ADF", ".nib", ".HELLO", ".dsk", ".xfd", ".woz", ".d$$", ".SET", ".SOL", ".Pat", ".CFG", ".BSF", ".RES", ".IMD", ".LFL", ".SQU", ".rsc", ".BBM", ".2 US", ".OVL", ".OVR", ".007", ".PNT", ".pat", ".CHK", ".MDT", ".EMC", ".ADV", ".FDT", ".GMC", ".FMC", ".info", ".HPF", ".hpf", ".INE", ".RBT", ".CSC", ".HEB", ".MID", ".lfl", ".LEC", ".HNM", ".QA", ".009", ".PRF", ".EGA", ".MHK", ".d64", ".prg", ".LZC", ".flac", ".IMS", ".REC", ".MOR", ".doc", ".HAG", ".AGA", ".BLB", ".TABLE", ".PAL", ".PRG", ".CLG", ".ORB", ".BRO", ".bro", ".PH1", ".DEF", ".IN", ".jpg", ".TOC", ".j2", ".Text", ".CEL", ".he0", ".AVI", ".1C", ".1c", ".BAK", ".L9", ".CGA", ".HRC", ".mhk", ".RED", ".SM0", ".SM1", ".SOU", ".RRM", ".LIB", ". Seuss's ABC", ".CNV", ".VOC", ".OGG", ".GME", ".GERMAN", ".SHR", ".FRENCH", ".DNR", ".DSK", ".dnr", ".CAT", ".V16", ".cab", ".CLU", ".b25c", ".RL", ".mp3", ".FRM", ".SOG", ".HEX", ".mma", ".st", ".MPC", ".IMG", ".ENC", ".SPR", ".AD", ".C", ".CON", ".PGM", ".Z", ".RL2", ".MMM", ".OBJ", ".ZFS", ".zfs", ".STR", ".z2", ".z1" }, StringComparer.OrdinalIgnoreCase); + static readonly HashSet IndexFiles = new HashSet(new[] + { ".0", ".1", ".2", ".3", ".5", ".6", ".8", ".16", ".25", ".99", + ".101", ".102", ".418", ".455", ".512", ".scummvm", + ".scumm", ".gam", ".z5", ".dat", ".blb", ".z6", + ".RAW", ".ROM", ".taf", ".zblorb", ".dcp", ".(a)", + ".cup", ".HE0", ".(A)", ".D$$", ".STK", ".z8", + ".hex", ".VMD", ".TGA", ".ITK", ".SCN", ".INF", + ".pic", ".Z5", ".z3", ".blorb", ".ulx", ".DAT", ".cas", + ".PIC", ".acd", ".006", ".SYS", ".alr", ".t3", ".gblorb", + ".tab", ".AP", ".CRC", ".EXE", ".z4", ".W32", ".MAC", + ".mac", ".WIN", ".001", ".003", ".000", ".bin", ".exe", + ".asl", ".AVD", ".INI", ".SND", ".cat", ".ANG", + ".CUP", ".SYS16", ".img", ".LB", ".TLK", ".MIX", + ".VQA", ".RLB", ".FNT", ".win", ".HE1", ".DMU", + ".FON", ".SCR", ".TEX", ".HEP", ".DIR", ".DRV", + ".MAP", ".a3c", ".GRV", ".CUR", ".OPT", ".gfx", ".ASK", + ".LNG", ".ini", ".RSC", ".SPP", ".CC", ".BND", ".LA0", + ".TRS", ".add", ".HRS", ".DFW", ".DR1", ".ALD", ".004", ".002", + ".005", ".R02", ".R00", ".C00", ".D00", ".GAM", ".IDX", ".ogg", + ".TXT", ".GRA", ".BMV", ".H$$", ".MSG", ".VGA", ".PKD", ".OUT", + ".99 (PG)", ".SAV", ".PAK", ".BIN", ".CPS", ".SHP", ".DXR", + ".dxr", ".gmp", ".SNG", ".C35", ".C06", ".WAV", ".SMK", + ".wav", ".CAB", ".game", ".Z6", ".(b)", ".slg", ".he2", + ".he1", ".HE2", ".SYN", ".PAT", ".NUT", ".nl", ".PRC", + ".V56", ".SEQ", ".P56", ".AUD", ".FKR", ".EX1", ".rom", + ".LIC", ".$00", ".ALL", ".LTK", ".txt", ".acx", ".VXD", + ".ACX", ".mpc", ".msd", ".ADF", ".nib", ".HELLO", ".dsk", + ".xfd", ".woz", ".d$$", ".SET", ".SOL", ".Pat", ".CFG", + ".BSF", ".RES", ".IMD", ".LFL", ".SQU", ".rsc", ".BBM", + ".2 US", ".OVL", ".OVR", ".007", ".PNT", ".pat", ".CHK", + ".MDT", ".EMC", ".ADV", ".FDT", ".GMC", ".FMC", ".info", + ".HPF", ".hpf", ".INE", ".RBT", ".CSC", ".HEB", ".MID", + ".lfl", ".LEC", ".HNM", ".QA", ".009", ".PRF", ".EGA", + ".MHK", ".d64", ".prg", ".LZC", ".flac", ".IMS", ".REC", + ".MOR", ".doc", ".HAG", ".AGA", ".BLB", ".TABLE", + ".PAL", ".PRG", ".CLG", ".ORB", ".BRO", ".bro", + ".PH1", ".DEF", ".IN", ".jpg", ".TOC", ".j2", + ".Text", ".CEL", ".he0", ".AVI", ".1C", ".1c", + ".BAK", ".L9", ".CGA", ".HRC", ".mhk", ".RED", + ".SM0", ".SM1", ".SOU", ".RRM", ".LIB", ". Seuss's ABC", + ".CNV", ".VOC", ".OGG", ".GME", ".GERMAN", ".SHR", + ".FRENCH", ".DNR", ".DSK", ".dnr", ".CAT", + ".V16", ".cab", ".CLU", ".b25c", ".RL", + ".mp3", ".FRM", ".SOG", ".HEX", ".mma", + ".st", ".MPC", ".IMG", ".ENC", ".SPR", + ".AD", ".C", ".CON", ".PGM", ".Z", ".RL2", + ".MMM", ".OBJ", ".ZFS", ".zfs", ".STR", + ".z2", ".z1" }, StringComparer.OrdinalIgnoreCase); + private ObservableCollection _games; private readonly HashSet _gameSignatures; private HashSet _folders; @@ -97,7 +147,8 @@ public GameLibraryViewModel() // LoadGameLibrary private async void LoadGameLibrary() { - await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () => + await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync( + CoreDispatcherPriority.Low, async () => { IsScanning = true; }); @@ -113,7 +164,9 @@ private async void LoadGames() await Task.Run(async () => { try { - _gamesContainer = ApplicationData.Current.LocalSettings.CreateContainer("Games", ApplicationDataCreateDisposition.Always); + _gamesContainer = ApplicationData.Current.LocalSettings.CreateContainer( + "Games", ApplicationDataCreateDisposition.Always); + var paths = (from gameContainer in _gamesContainer.Containers.Values let path = (string)gameContainer.Values["Path"] select path).ToList(); @@ -125,7 +178,8 @@ await Task.Run(async () => { { TotalGamesScanned++; double progress = ((TotalGamesScanned * 1d) / (TotalItems * 1d)) * 100; - await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () => + await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync( + CoreDispatcherPriority.Low, async () => { LoadingProgressValue = progress; }); @@ -152,7 +206,8 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio { TotalGamesScanned++; double progress = ((TotalGamesScanned * 1d) / (TotalItems * 1d)) * 100; - await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () => + await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync( + CoreDispatcherPriority.Low, async () => { LoadingProgressValue = progress; _gameSignatures.Add(item.Game.Path); @@ -160,7 +215,8 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio }); } - await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () => + await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync( + CoreDispatcherPriority.Low, async () => { IsScanning = false; LoadingProgressValue = 0; @@ -175,7 +231,9 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio private void LoadGameFolders() { - _foldersContainer = ApplicationData.Current.LocalSettings.CreateContainer("Folders", ApplicationDataCreateDisposition.Always); + _foldersContainer = ApplicationData.Current.LocalSettings.CreateContainer("Folders", + ApplicationDataCreateDisposition.Always); + var folders = from folderContainer in _foldersContainer.Containers.Values let path = (string)folderContainer.Values["Path"] select path; @@ -206,7 +264,8 @@ await Task.Run(async () => try { TotalGamesScanned++; - await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () => + await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync( + CoreDispatcherPriority.Low, async () => { try { @@ -215,7 +274,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio } catch (Exception ex) { - + Debug.WriteLine("[ex] GameLibraryViewModel Scan" + ex.Message); } }); if (IndexFiles.Contains(Path.GetExtension(item.Path).ToLower())) @@ -229,7 +288,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio } catch (Exception ex) { - + Debug.WriteLine("[ex] GameLibraryViewModel Scan" + ex.Message); } } taskCompletionSource.SetResult(true); diff --git a/NScumm.UWP/ViewModels/GameViewModel.cs b/Src/NScumm.UWP/ViewModels/GameViewModel.cs similarity index 100% rename from NScumm.UWP/ViewModels/GameViewModel.cs rename to Src/NScumm.UWP/ViewModels/GameViewModel.cs diff --git a/NScumm.UWP/ViewModels/ViewModel.cs b/Src/NScumm.UWP/ViewModels/ViewModel.cs similarity index 100% rename from NScumm.UWP/ViewModels/ViewModel.cs rename to Src/NScumm.UWP/ViewModels/ViewModel.cs diff --git a/NScumm.UWP/XAudio2Mixer.cs b/Src/NScumm.UWP/XAudio2Mixer.cs similarity index 91% rename from NScumm.UWP/XAudio2Mixer.cs rename to Src/NScumm.UWP/XAudio2Mixer.cs index 794a73f..021070c 100644 --- a/NScumm.UWP/XAudio2Mixer.cs +++ b/Src/NScumm.UWP/XAudio2Mixer.cs @@ -1,4 +1,7 @@ -using NScumm.Core.Audio; +// XAudio2Mixer.cs +// ... + +using NScumm.Core.Audio; using NScumm.Core.Audio.SampleProviders; using System; using System.Linq; @@ -7,6 +10,7 @@ using SharpDX.XAudio2; using SharpDX.Multimedia; using SharpDX; +using System.Diagnostics; namespace NScumm.MonoGame { @@ -54,6 +58,7 @@ public bool FillWith(IAudioSampleProvider audioSampleProvider) } catch (Exception ex) { + Debug.WriteLine("[ex] XAudio2Mixer (FillWith) : " + ex.Message); return false; } return true; @@ -108,7 +113,8 @@ public void SetSampleProvider(IAudioSampleProvider audioSampleProvider) { FillBuffer(i); } - _audioThread = Task.Factory.StartNew(OnAudioThread, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); + _audioThread = Task.Factory.StartNew(OnAudioThread, CancellationToken.None, + TaskCreationOptions.LongRunning, TaskScheduler.Default); _voice.Start(); } @@ -155,7 +161,7 @@ private void OnAudioThread() } catch (Exception ex) { - + Debug.WriteLine("[ex] XAudio2Mixer (OnAudioThread) : " + ex.Message); } } @@ -170,9 +176,9 @@ private bool FillBuffer(int index) _voice.SubmitSourceBuffer(_buffers[index].Buffer, null); } } - catch (Exception x) + catch (Exception ex) { - + Debug.WriteLine("[ex] XAudio2Mixer (FillBuffer) : " + ex.Message); } return state; } diff --git a/NScumm.UWP/XnaGraphicsManager.cs b/Src/NScumm.UWP/XnaGraphicsManager.cs similarity index 95% rename from NScumm.UWP/XnaGraphicsManager.cs rename to Src/NScumm.UWP/XnaGraphicsManager.cs index c83267f..c8aae15 100644 --- a/NScumm.UWP/XnaGraphicsManager.cs +++ b/Src/NScumm.UWP/XnaGraphicsManager.cs @@ -5,19 +5,7 @@ // scemino // // Copyright (c) 2015 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . + using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; diff --git a/NScumm.UWP/XnaInputManager.cs b/Src/NScumm.UWP/XnaInputManager.cs similarity index 94% rename from NScumm.UWP/XnaInputManager.cs rename to Src/NScumm.UWP/XnaInputManager.cs index 3ede83f..c55ad74 100644 --- a/NScumm.UWP/XnaInputManager.cs +++ b/Src/NScumm.UWP/XnaInputManager.cs @@ -5,20 +5,6 @@ // scemino // // Copyright (c) 2015 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - using Microsoft.Xna.Framework.Input; using NScumm.Core.Input;