diff options
| -rw-r--r-- | different-licenses/48.rom (renamed from wpspec/wpspec/Resources/48.rom) | bin | 16384 -> 16384 bytes | |||
| -rw-r--r-- | different-licenses/Read Me.txt | 12 | ||||
| -rw-r--r-- | different-licenses/zxspec_v2.rar | bin | 0 -> 41198 bytes | |||
| -rw-r--r-- | wpspec/wpspec/Spectrum/Emulation.cs | 5 | ||||
| -rw-r--r-- | wpspec/wpspec/wpspec.csproj | 4 |
5 files changed, 20 insertions, 1 deletions
diff --git a/wpspec/wpspec/Resources/48.rom b/different-licenses/48.rom Binary files differindex 4d6895e..4d6895e 100644 --- a/wpspec/wpspec/Resources/48.rom +++ b/different-licenses/48.rom diff --git a/different-licenses/Read Me.txt b/different-licenses/Read Me.txt index e69de29..2021f47 100644 --- a/different-licenses/Read Me.txt +++ b/different-licenses/Read Me.txt @@ -0,0 +1,12 @@ +These files are not covered by the GNU General Public License.
+
+48.rom
+
+ This is an image of the Spectrum 48K ROM. This code is (c) Copyright
+ Amstrad PLC. They allow this to be used for emulation purposes.
+
+zxspec_v2.rar
+
+ A Spectrum Keyboard font, (c) Copyright Paul Reid (TracerTong).
+
+ http://tracertong.co.uk/ttf/2010/05/zx-spectrum-keyboard/
diff --git a/different-licenses/zxspec_v2.rar b/different-licenses/zxspec_v2.rar Binary files differnew file mode 100644 index 0000000..fb42602 --- /dev/null +++ b/different-licenses/zxspec_v2.rar diff --git a/wpspec/wpspec/Spectrum/Emulation.cs b/wpspec/wpspec/Spectrum/Emulation.cs index 7564022..563e23a 100644 --- a/wpspec/wpspec/Spectrum/Emulation.cs +++ b/wpspec/wpspec/Spectrum/Emulation.cs @@ -442,6 +442,11 @@ namespace wpspec.Spectrum Uri uri = new Uri("Resources/48.rom", UriKind.Relative);
StreamResourceInfo file = App.GetResourceStream(uri);
+ if (file == null)
+ {
+ throw new Exception("Failed to load Spectrum ROM");
+ }
+
file.Stream.Read(mem, 0, 0x4000);
file.Stream.Close();
diff --git a/wpspec/wpspec/wpspec.csproj b/wpspec/wpspec/wpspec.csproj index 34fc200..09ae6bf 100644 --- a/wpspec/wpspec/wpspec.csproj +++ b/wpspec/wpspec/wpspec.csproj @@ -149,11 +149,13 @@ </Page>
</ItemGroup>
<ItemGroup>
+ <Content Include="..\..\different-licenses\48.rom">
+ <Link>Resources\48.rom</Link>
+ </Content>
<None Include="Properties\AppManifest.xml" />
<None Include="Properties\WMAppManifest.xml">
<SubType>Designer</SubType>
</None>
- <Content Include="Resources\48.rom" />
<Content Include="Resources\Spectrum.keyboard" />
</ItemGroup>
<ItemGroup>
|