diff options
| author | Ian C <ianc@noddybox.co.uk> | 2012-05-07 15:26:30 +0000 |
|---|---|---|
| committer | Ian C <ianc@noddybox.co.uk> | 2012-05-07 15:26:30 +0000 |
| commit | 5f9b4b9c5dab70fd70be2872653e9fe6a7aced5a (patch) | |
| tree | dd7d6021ccb38fa10006f31c362f81358b57f8a9 | |
| parent | 9224c1445eec09e588220ee2f2dca5f71a0b0770 (diff) | |
Changed keyboard
| -rw-r--r-- | wpspec/wpspec/GamePage.xaml.cs | 2 | ||||
| -rw-r--r-- | wpspec/wpspec/Resources/Spectrum.keyboard | bin | 920 -> 921 bytes | |||
| -rw-r--r-- | wpspec/wpspec/Spectrum/Emulation.cs | 22 | ||||
| -rw-r--r-- | wpspec/wpspecLibContent/keyboard.png | bin | 114056 -> 41620 bytes |
4 files changed, 2 insertions, 22 deletions
diff --git a/wpspec/wpspec/GamePage.xaml.cs b/wpspec/wpspec/GamePage.xaml.cs index 96c690a..a6bfd29 100644 --- a/wpspec/wpspec/GamePage.xaml.cs +++ b/wpspec/wpspec/GamePage.xaml.cs @@ -107,7 +107,7 @@ namespace wpspec keyboard = new KeyboardDriver<SpectrumKeySymbol>
(SharedGraphicsDeviceManager.Current.GraphicsDevice,
keyboardImage,
- new Vector2(0, 600),
+ new Vector2(0, 560),
Shared.SpectrumKeyboard);
keyboard.KeyEvent += HandleKeyboardEvent;
diff --git a/wpspec/wpspec/Resources/Spectrum.keyboard b/wpspec/wpspec/Resources/Spectrum.keyboard Binary files differindex 853129a..3e94ca1 100644 --- a/wpspec/wpspec/Resources/Spectrum.keyboard +++ b/wpspec/wpspec/Resources/Spectrum.keyboard diff --git a/wpspec/wpspec/Spectrum/Emulation.cs b/wpspec/wpspec/Spectrum/Emulation.cs index 563e23a..113a500 100644 --- a/wpspec/wpspec/Spectrum/Emulation.cs +++ b/wpspec/wpspec/Spectrum/Emulation.cs @@ -63,26 +63,6 @@ namespace wpspec.Spectrum private readonly int[] screenAccel = new int[192];
private readonly int[] attrAccel = new int[192];
- //private readonly uint[] colours = new uint[16]
- //{
- // new Color(0x00, 0x00, 0x00).PackedValue, // BLACK
- // new Color(0x00, 0x00, 0xe6).PackedValue, // BLUE
- // new Color(0xe6, 0x00, 0x00).PackedValue, // RED
- // new Color(0xe6, 0x00, 0xe6).PackedValue, // MAGENTA
- // new Color(0x00, 0xe6, 0x00).PackedValue, // GREEN
- // new Color(0x00, 0xe6, 0xe6).PackedValue, // CYAN
- // new Color(0xe6, 0xe6, 0x00).PackedValue, // YELLOW
- // new Color(0xe6, 0xe6, 0xe6).PackedValue, // WHITE
- // new Color(0x00, 0x00, 0x00).PackedValue, // BLACK (BRIGHT)
- // new Color(0x00, 0x00, 0xff).PackedValue, // BLUE (BRIGHT)
- // new Color(0xff, 0x00, 0x00).PackedValue, // RED (BRIGHT)
- // new Color(0xff, 0x00, 0xff).PackedValue, // MAGENTA (BRIGHT)
- // new Color(0x00, 0xff, 0x00).PackedValue, // GREEN (BRIGHT)
- // new Color(0x00, 0xff, 0xff).PackedValue, // CYAN (BRIGHT)
- // new Color(0xff, 0xff, 0x00).PackedValue, // YELLOW (BRIGHT)
- // new Color(0xff, 0xff, 0xff).PackedValue // WHITE (BRIGHT)
- //};
-
private readonly ushort[] colours = new ushort[16]
{
GetColour(0x00, 0x00, 0x00), // BLACK
@@ -518,7 +498,7 @@ namespace wpspec.Spectrum matrixLookup[SpectrumKeySymbol.KeyL] = new KeyMatrix(6, 0x02);
matrixLookup[SpectrumKeySymbol.KeyEnter] = new KeyMatrix(6, 0x01);
- matrixLookup[SpectrumKeySymbol.KeyCapsLock] = new KeyMatrix(0, 0x01);
+ matrixLookup[SpectrumKeySymbol.KeyCapsShift] = new KeyMatrix(0, 0x01);
matrixLookup[SpectrumKeySymbol.KeyZ] = new KeyMatrix(0, 0x02);
matrixLookup[SpectrumKeySymbol.KeyX] = new KeyMatrix(0, 0x04);
matrixLookup[SpectrumKeySymbol.KeyC] = new KeyMatrix(0, 0x08);
diff --git a/wpspec/wpspecLibContent/keyboard.png b/wpspec/wpspecLibContent/keyboard.png Binary files differindex a607364..d07908c 100644 --- a/wpspec/wpspecLibContent/keyboard.png +++ b/wpspec/wpspecLibContent/keyboard.png |
