From 0dd3ff7a16369069350e429776bcb7ae4c0c20b3 Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Sat, 21 Dec 2024 20:27:43 +0100 Subject: [PATCH] Refactoring, improving documentation --- Decor.cs | 90 ++-- Def.cs | 9 +- Game1.cs | 156 +++---- InputPad.cs | 395 ++++++++---------- .../Guide.cs | 2 +- Pixmap.cs | 88 ++-- Slider.cs | 6 +- TinyPoint.cs | 5 + 8 files changed, 363 insertions(+), 388 deletions(-) diff --git a/Decor.cs b/Decor.cs index 2d236d7..7aa6752 100644 --- a/Decor.cs +++ b/Decor.cs @@ -342,7 +342,7 @@ namespace WindowsPhoneSpeedyBlupi } } - public Def.ButtonGlygh ButtonPressed { get; set; } + public Def.ButtonGlyph ButtonPressed { get; set; } private static void MoveObjectCopy(ref MoveObject dst, MoveObject src) { @@ -1598,27 +1598,27 @@ namespace WindowsPhoneSpeedyBlupi gameData.SetDoors(m_doors); } - public static string GetCheatTinyText(Def.ButtonGlygh glyph) + public static string GetCheatTinyText(Def.ButtonGlyph glyph) { switch (glyph) { - case Def.ButtonGlygh.Cheat1: + case Def.ButtonGlyph.Cheat1: return "D"; - case Def.ButtonGlygh.Cheat2: + case Def.ButtonGlyph.Cheat2: return "B"; - case Def.ButtonGlygh.Cheat3: + case Def.ButtonGlyph.Cheat3: return "S"; - case Def.ButtonGlygh.Cheat4: + case Def.ButtonGlyph.Cheat4: return "E"; - case Def.ButtonGlygh.Cheat5: + case Def.ButtonGlyph.Cheat5: return "R"; - case Def.ButtonGlygh.Cheat6: + case Def.ButtonGlyph.Cheat6: return "T"; - case Def.ButtonGlygh.Cheat7: + case Def.ButtonGlyph.Cheat7: return "C"; - case Def.ButtonGlygh.Cheat8: + case Def.ButtonGlyph.Cheat8: return "T"; - case Def.ButtonGlygh.Cheat9: + case Def.ButtonGlyph.Cheat9: return "G"; default: return ""; @@ -3456,9 +3456,9 @@ namespace WindowsPhoneSpeedyBlupi end.X += (int)m_blupiVitesseX; } MoveObjectPollution(); - if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && m_blupiTransport == -1) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && m_blupiTransport == -1) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; rect.Left = m_blupiPos.X + 20; rect.Right = m_blupiPos.X + 22; rect.Top = m_blupiPos.Y + 60 - 2; @@ -3577,9 +3577,9 @@ namespace WindowsPhoneSpeedyBlupi } end.X += (int)m_blupiVitesseX; MoveObjectPollution(); - if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && m_blupiTransport == -1) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && m_blupiTransport == -1) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; rect.Left = m_blupiPos.X + 20; rect.Right = m_blupiPos.X + 22; rect.Top = m_blupiPos.Y + 60 - 2; @@ -3861,9 +3861,9 @@ namespace WindowsPhoneSpeedyBlupi } m_blupiOffsetY = Math.Abs(m_blupiRealRotation / 2); MoveObjectPollution(); - if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && m_blupiTransport == -1) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && m_blupiTransport == -1) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; celSwitch.X = m_blupiPos.X; celSwitch.Y = m_blupiPos.Y - BLUPIFLOOR; ObjectStart(celSwitch, 19, 0); @@ -3993,9 +3993,9 @@ namespace WindowsPhoneSpeedyBlupi } end.X += (int)m_blupiVitesseX; MoveObjectPollution(); - if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && m_blupiTransport == -1) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && m_blupiTransport == -1) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; celSwitch.X = m_blupiPos.X; celSwitch.Y = m_blupiPos.Y; ObjectStart(celSwitch, 28, 0); @@ -4055,9 +4055,9 @@ namespace WindowsPhoneSpeedyBlupi m_blupiVitesseX = 0.0; } end.X += (int)m_blupiVitesseX; - if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && !m_blupiAir && m_blupiTransport == -1 && m_blupiVitesseX < 8.0) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && !m_blupiAir && m_blupiTransport == -1 && m_blupiVitesseX < 8.0) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; m_blupiSkate = false; m_blupiAction = 43; m_blupiPhase = 0; @@ -4346,11 +4346,11 @@ namespace WindowsPhoneSpeedyBlupi PlaySound(35, end); } } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiTank && !m_blupiJeep && !m_blupiSkate && !flag2 && m_blupiTransport == -1 && m_blupiFocus) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiTank && !m_blupiJeep && !m_blupiSkate && !flag2 && m_blupiTransport == -1 && m_blupiFocus) { if (m_blupiDynamite > 0) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; rect.Left = end.X + 18; rect.Right = end.X + 20; rect.Top = end.Y + 60 - 2; @@ -4372,7 +4372,7 @@ namespace WindowsPhoneSpeedyBlupi } else if (m_blupiPerso > 0) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; icon = MoveObjectDetect(end, out bNear); if (icon == -1 || m_moveObject[icon].type != 200) { @@ -5063,9 +5063,9 @@ namespace WindowsPhoneSpeedyBlupi m_blupiRestart = true; m_blupiAir = true; } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && (num26 == -1 || !bNear) && IsSwitch(m_blupiPos, ref celSwitch) && !m_blupiOver && !m_blupiBalloon && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiShield && !m_blupiHide && !m_bSuperBlupi && m_blupiFocus) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && (num26 == -1 || !bNear) && IsSwitch(m_blupiPos, ref celSwitch) && !m_blupiOver && !m_blupiBalloon && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiShield && !m_blupiHide && !m_bSuperBlupi && m_blupiFocus) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; ActiveSwitch(m_decor[celSwitch.X, celSwitch.Y].icon == 385, celSwitch); m_blupiAction = 82; m_blupiPhase = 0; @@ -5173,9 +5173,9 @@ namespace WindowsPhoneSpeedyBlupi } if (icon != -1 && bNear) { - if (m_moveObject[icon].type == 13 && (ButtonPressed == Def.ButtonGlygh.PlayAction || IsFloatingObject(icon)) && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) + if (m_moveObject[icon].type == 13 && (ButtonPressed == Def.ButtonGlyph.PlayAction || IsFloatingObject(icon)) && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type); m_scrollAdd.X = 0; m_scrollAdd.Y = 0; @@ -5190,9 +5190,9 @@ namespace WindowsPhoneSpeedyBlupi m_jauges[1].SetHide(true); } } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 46 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 46 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type); m_scrollAdd.X = 0; m_scrollAdd.Y = 0; @@ -5206,9 +5206,9 @@ namespace WindowsPhoneSpeedyBlupi m_jauges[1].SetHide(true); } } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 19 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 19 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type); m_scrollAdd.X = 0; m_scrollAdd.Y = 0; @@ -5224,9 +5224,9 @@ namespace WindowsPhoneSpeedyBlupi m_jauges[1].SetHide(true); } } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 28 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 28 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type); m_scrollAdd.X = 0; m_scrollAdd.Y = 0; @@ -5256,9 +5256,9 @@ namespace WindowsPhoneSpeedyBlupi m_blupiBullet = 10; } } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 24 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 24 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; m_scrollAdd.X = 0; m_scrollAdd.Y = 0; m_blupiAction = 42; @@ -5518,9 +5518,9 @@ namespace WindowsPhoneSpeedyBlupi m_blupiPosMagic = m_blupiPos; m_jauges[1].SetHide(false); } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 26 && !m_blupiShield && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && m_blupiFocus) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 26 && !m_blupiShield && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && m_blupiFocus) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; m_sucettePos = m_moveObject[icon].posCurrent; m_sucetteType = m_moveObject[icon].type; ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type); @@ -5544,9 +5544,9 @@ namespace WindowsPhoneSpeedyBlupi ObjectStart(m_blupiPos, 41, 10); ObjectStart(m_blupiPos, 41, -10); } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 30 && !m_blupiShield && !m_blupiCloud && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && m_blupiFocus) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 30 && !m_blupiShield && !m_blupiCloud && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && m_blupiFocus) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; m_sucettePos = m_moveObject[icon].posCurrent; m_sucetteType = m_moveObject[icon].type; ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type); @@ -5579,9 +5579,9 @@ namespace WindowsPhoneSpeedyBlupi { if (m_moveObject[icon].type == 200) { - if (m_blupiPerso < 5 && ButtonPressed == Def.ButtonGlygh.PlayAction) + if (m_blupiPerso < 5 && ButtonPressed == Def.ButtonGlyph.PlayAction) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type); celSwitch.X = m_moveObject[icon].posCurrent.X - m_posDecor.X; celSwitch.Y = m_moveObject[icon].posCurrent.Y - m_posDecor.Y; @@ -5603,9 +5603,9 @@ namespace WindowsPhoneSpeedyBlupi m_decorPhase = 0; } } - if (m_moveObject[icon].type == 55 && m_blupiFocus && m_blupiDynamite == 0 && (m_voyageIcon != 252 || m_voyageChannel != 10) && ButtonPressed == Def.ButtonGlygh.PlayAction) + if (m_moveObject[icon].type == 55 && m_blupiFocus && m_blupiDynamite == 0 && (m_voyageIcon != 252 || m_voyageChannel != 10) && ButtonPressed == Def.ButtonGlyph.PlayAction) { - ButtonPressed = Def.ButtonGlygh.None; + ButtonPressed = Def.ButtonGlyph.None; ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type); celSwitch.X = m_moveObject[icon].posCurrent.X - m_posDecor.X; celSwitch.Y = m_moveObject[icon].posCurrent.Y - m_posDecor.Y; @@ -5849,7 +5849,7 @@ namespace WindowsPhoneSpeedyBlupi m_blupiPhase = 0; m_blupiFocus = true; } - if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_blupiAction == 1) + if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_blupiAction == 1) { m_blupiAction = 84; m_blupiPhase = 0; diff --git a/Def.cs b/Def.cs index 6a8ccb2..536a4b8 100644 --- a/Def.cs +++ b/Def.cs @@ -3,6 +3,8 @@ +using Microsoft.Xna.Framework.Input; + namespace WindowsPhoneSpeedyBlupi { @@ -37,7 +39,7 @@ namespace WindowsPhoneSpeedyBlupi Ranking } - public enum ButtonGlygh + public enum ButtonGlyph { None, InitGamerA, @@ -85,11 +87,6 @@ namespace WindowsPhoneSpeedyBlupi Cheat9 } - public enum KeyboardPress - { - None = 0, Up = 1, Right = 2, Down = 3, Left = 4, LeftControl = 5, Space = 6, Escape = 7, Pause = 8 - } - public const int LXIMAGE = 640; public const int LYIMAGE = 480; diff --git a/Game1.cs b/Game1.cs index 0d8c771..28676ea 100644 --- a/Game1.cs +++ b/Game1.cs @@ -20,18 +20,18 @@ namespace WindowsPhoneSpeedyBlupi 0.94, 91.0, 1.0, 100.0 }; - private static readonly Def.ButtonGlygh[] cheatGeste = new Def.ButtonGlygh[10] + private static readonly Def.ButtonGlyph[] cheatGeste = new Def.ButtonGlyph[10] { - Def.ButtonGlygh.Cheat12, - Def.ButtonGlygh.Cheat22, - Def.ButtonGlygh.Cheat32, - Def.ButtonGlygh.Cheat12, - Def.ButtonGlygh.Cheat11, - Def.ButtonGlygh.Cheat21, - Def.ButtonGlygh.Cheat22, - Def.ButtonGlygh.Cheat21, - Def.ButtonGlygh.Cheat31, - Def.ButtonGlygh.Cheat32 + Def.ButtonGlyph.Cheat12, + Def.ButtonGlyph.Cheat22, + Def.ButtonGlyph.Cheat32, + Def.ButtonGlyph.Cheat12, + Def.ButtonGlyph.Cheat11, + Def.ButtonGlyph.Cheat21, + Def.ButtonGlyph.Cheat22, + Def.ButtonGlyph.Cheat21, + Def.ButtonGlyph.Cheat31, + Def.ButtonGlyph.Cheat32 }; private readonly GraphicsDeviceManager graphics; @@ -235,41 +235,41 @@ namespace WindowsPhoneSpeedyBlupi return; } inputPad.Update(); - Def.ButtonGlygh buttonPressed = inputPad.ButtonPressed; - if (buttonPressed >= Def.ButtonGlygh.InitGamerA && buttonPressed <= Def.ButtonGlygh.InitGamerC) + Def.ButtonGlyph buttonPressed = inputPad.ButtonPressed; + if (buttonPressed >= Def.ButtonGlyph.InitGamerA && buttonPressed <= Def.ButtonGlyph.InitGamerC) { SetGamer((int)(buttonPressed - 1)); return; } switch (buttonPressed) { - case Def.ButtonGlygh.InitSetup: + case Def.ButtonGlyph.InitSetup: SetPhase(Def.Phase.MainSetup); return; - case Def.ButtonGlygh.PauseSetup: + case Def.ButtonGlyph.PauseSetup: SetPhase(Def.Phase.PlaySetup); return; - case Def.ButtonGlygh.SetupSounds: + case Def.ButtonGlyph.SetupSounds: gameData.Sounds = !gameData.Sounds; gameData.Write(); return; - case Def.ButtonGlygh.SetupJump: + case Def.ButtonGlyph.SetupJump: gameData.JumpRight = !gameData.JumpRight; gameData.Write(); return; - case Def.ButtonGlygh.SetupZoom: + case Def.ButtonGlyph.SetupZoom: gameData.AutoZoom = !gameData.AutoZoom; gameData.Write(); return; - case Def.ButtonGlygh.SetupAccel: + case Def.ButtonGlyph.SetupAccel: gameData.AccelActive = !gameData.AccelActive; gameData.Write(); return; - case Def.ButtonGlygh.SetupReset: + case Def.ButtonGlyph.SetupReset: gameData.Reset(); gameData.Write(); return; - case Def.ButtonGlygh.SetupReturn: + case Def.ButtonGlyph.SetupReturn: if (playSetup) { SetPhase(Def.Phase.Play, -1); @@ -279,50 +279,50 @@ namespace WindowsPhoneSpeedyBlupi SetPhase(Def.Phase.Init); } return; - case Def.ButtonGlygh.InitPlay: + case Def.ButtonGlyph.InitPlay: SetPhase(Def.Phase.Play, 1); return; - case Def.ButtonGlygh.PlayPause: + case Def.ButtonGlyph.PlayPause: SetPhase(Def.Phase.Pause); return; - case Def.ButtonGlygh.WinLostReturn: - case Def.ButtonGlygh.PauseMenu: - case Def.ButtonGlygh.ResumeMenu: + case Def.ButtonGlyph.WinLostReturn: + case Def.ButtonGlyph.PauseMenu: + case Def.ButtonGlyph.ResumeMenu: SetPhase(Def.Phase.Init); break; } switch (buttonPressed) { - case Def.ButtonGlygh.ResumeContinue: + case Def.ButtonGlyph.ResumeContinue: ContinueMission(); return; - case Def.ButtonGlygh.InitBuy: - case Def.ButtonGlygh.TrialBuy: + case Def.ButtonGlyph.InitBuy: + case Def.ButtonGlyph.TrialBuy: Guide.Show(PlayerIndex.One); SetPhase(Def.Phase.Init); return; - case Def.ButtonGlygh.InitRanking: + case Def.ButtonGlyph.InitRanking: SetPhase(Def.Phase.Ranking); return; - case Def.ButtonGlygh.TrialCancel: - case Def.ButtonGlygh.RankingContinue: + case Def.ButtonGlyph.TrialCancel: + case Def.ButtonGlyph.RankingContinue: SetPhase(Def.Phase.Init); return; - case Def.ButtonGlygh.PauseBack: + case Def.ButtonGlyph.PauseBack: MissionBack(); return; - case Def.ButtonGlygh.PauseRestart: + case Def.ButtonGlyph.PauseRestart: SetPhase(Def.Phase.Play, mission); return; - case Def.ButtonGlygh.PauseContinue: + case Def.ButtonGlyph.PauseContinue: SetPhase(Def.Phase.Play, -1); return; - case Def.ButtonGlygh.Cheat11: - case Def.ButtonGlygh.Cheat12: - case Def.ButtonGlygh.Cheat21: - case Def.ButtonGlygh.Cheat22: - case Def.ButtonGlygh.Cheat31: - case Def.ButtonGlygh.Cheat32: + case Def.ButtonGlyph.Cheat11: + case Def.ButtonGlyph.Cheat12: + case Def.ButtonGlyph.Cheat21: + case Def.ButtonGlyph.Cheat22: + case Def.ButtonGlyph.Cheat31: + case Def.ButtonGlyph.Cheat32: if (buttonPressed == cheatGeste[cheatGesteIndex]) { cheatGesteIndex++; @@ -344,7 +344,7 @@ namespace WindowsPhoneSpeedyBlupi } break; } - if (buttonPressed >= Def.ButtonGlygh.Cheat1 && buttonPressed <= Def.ButtonGlygh.Cheat9) + if (buttonPressed >= Def.ButtonGlyph.Cheat1 && buttonPressed <= Def.ButtonGlyph.Cheat9) { CheatAction(buttonPressed); } @@ -421,35 +421,35 @@ namespace WindowsPhoneSpeedyBlupi inputPad.StartMission(mission); } - private void CheatAction(Def.ButtonGlygh glyph) + private void CheatAction(Def.ButtonGlyph glyph) { switch (glyph) { - case Def.ButtonGlygh.Cheat1: + case Def.ButtonGlyph.Cheat1: decor.CheatAction(Tables.CheatCodes.OpenDoors); break; - case Def.ButtonGlygh.Cheat2: + case Def.ButtonGlyph.Cheat2: decor.CheatAction(Tables.CheatCodes.SuperBlupi); break; - case Def.ButtonGlygh.Cheat3: + case Def.ButtonGlyph.Cheat3: decor.CheatAction(Tables.CheatCodes.ShowSecret); break; - case Def.ButtonGlygh.Cheat4: + case Def.ButtonGlyph.Cheat4: decor.CheatAction(Tables.CheatCodes.LayEgg); break; - case Def.ButtonGlygh.Cheat5: + case Def.ButtonGlyph.Cheat5: gameData.Reset(); break; - case Def.ButtonGlygh.Cheat6: + case Def.ButtonGlyph.Cheat6: simulateTrialMode = !simulateTrialMode; break; - case Def.ButtonGlygh.Cheat7: + case Def.ButtonGlyph.Cheat7: decor.CheatAction(Tables.CheatCodes.CleanAll); break; - case Def.ButtonGlygh.Cheat8: + case Def.ButtonGlyph.Cheat8: decor.CheatAction(Tables.CheatCodes.AllTreasure); break; - case Def.ButtonGlygh.Cheat9: + case Def.ButtonGlyph.Cheat9: decor.CheatAction(Tables.CheatCodes.EndGoal); break; } @@ -709,49 +709,49 @@ namespace WindowsPhoneSpeedyBlupi { if (phase == Def.Phase.Init) { - DrawButtonGamerText(Def.ButtonGlygh.InitGamerA, 0); - DrawButtonGamerText(Def.ButtonGlygh.InitGamerB, 1); - DrawButtonGamerText(Def.ButtonGlygh.InitGamerC, 2); - DrawTextUnderButton(Def.ButtonGlygh.InitPlay, MyResource.TX_BUTTON_PLAY); - DrawTextRightButton(Def.ButtonGlygh.InitSetup, MyResource.TX_BUTTON_SETUP); + DrawButtonGamerText(Def.ButtonGlyph.InitGamerA, 0); + DrawButtonGamerText(Def.ButtonGlyph.InitGamerB, 1); + DrawButtonGamerText(Def.ButtonGlyph.InitGamerC, 2); + DrawTextUnderButton(Def.ButtonGlyph.InitPlay, MyResource.TX_BUTTON_PLAY); + DrawTextRightButton(Def.ButtonGlyph.InitSetup, MyResource.TX_BUTTON_SETUP); if (IsTrialMode) { - DrawTextUnderButton(Def.ButtonGlygh.InitBuy, MyResource.TX_BUTTON_BUY); + DrawTextUnderButton(Def.ButtonGlyph.InitBuy, MyResource.TX_BUTTON_BUY); } if (IsRankingMode) { - DrawTextUnderButton(Def.ButtonGlygh.InitRanking, MyResource.TX_BUTTON_RANKING); + DrawTextUnderButton(Def.ButtonGlyph.InitRanking, MyResource.TX_BUTTON_RANKING); } } if (phase == Def.Phase.Pause) { - DrawTextUnderButton(Def.ButtonGlygh.PauseMenu, MyResource.TX_BUTTON_MENU); + DrawTextUnderButton(Def.ButtonGlyph.PauseMenu, MyResource.TX_BUTTON_MENU); if (mission != 1) { - DrawTextUnderButton(Def.ButtonGlygh.PauseBack, MyResource.TX_BUTTON_BACK); + DrawTextUnderButton(Def.ButtonGlyph.PauseBack, MyResource.TX_BUTTON_BACK); } - DrawTextUnderButton(Def.ButtonGlygh.PauseSetup, MyResource.TX_BUTTON_SETUP); + DrawTextUnderButton(Def.ButtonGlyph.PauseSetup, MyResource.TX_BUTTON_SETUP); if (mission != 1 && mission % 10 != 0) { - DrawTextUnderButton(Def.ButtonGlygh.PauseRestart, MyResource.TX_BUTTON_RESTART); + DrawTextUnderButton(Def.ButtonGlyph.PauseRestart, MyResource.TX_BUTTON_RESTART); } - DrawTextUnderButton(Def.ButtonGlygh.PauseContinue, MyResource.TX_BUTTON_CONTINUE); + DrawTextUnderButton(Def.ButtonGlyph.PauseContinue, MyResource.TX_BUTTON_CONTINUE); } if (phase == Def.Phase.Resume) { - DrawTextUnderButton(Def.ButtonGlygh.ResumeMenu, MyResource.TX_BUTTON_MENU); - DrawTextUnderButton(Def.ButtonGlygh.ResumeContinue, MyResource.TX_BUTTON_CONTINUE); + DrawTextUnderButton(Def.ButtonGlyph.ResumeMenu, MyResource.TX_BUTTON_MENU); + DrawTextUnderButton(Def.ButtonGlyph.ResumeContinue, MyResource.TX_BUTTON_CONTINUE); } if (phase == Def.Phase.MainSetup || phase == Def.Phase.PlaySetup) { - DrawTextRightButton(Def.ButtonGlygh.SetupSounds, MyResource.TX_BUTTON_SETUP_SOUNDS); - DrawTextRightButton(Def.ButtonGlygh.SetupJump, MyResource.TX_BUTTON_SETUP_JUMP); - DrawTextRightButton(Def.ButtonGlygh.SetupZoom, MyResource.TX_BUTTON_SETUP_ZOOM); - DrawTextRightButton(Def.ButtonGlygh.SetupAccel, MyResource.TX_BUTTON_SETUP_ACCEL); + DrawTextRightButton(Def.ButtonGlyph.SetupSounds, MyResource.TX_BUTTON_SETUP_SOUNDS); + DrawTextRightButton(Def.ButtonGlyph.SetupJump, MyResource.TX_BUTTON_SETUP_JUMP); + DrawTextRightButton(Def.ButtonGlyph.SetupZoom, MyResource.TX_BUTTON_SETUP_ZOOM); + DrawTextRightButton(Def.ButtonGlyph.SetupAccel, MyResource.TX_BUTTON_SETUP_ACCEL); if (phase == Def.Phase.MainSetup) { string text = string.Format(MyResource.LoadString(MyResource.TX_BUTTON_SETUP_RESET), new string((char)(65 + gameData.SelectedGamer), 1)); - DrawTextRightButton(Def.ButtonGlygh.SetupReset, text); + DrawTextRightButton(Def.ButtonGlyph.SetupReset, text); } } if (phase == Def.Phase.Trial) @@ -771,16 +771,16 @@ namespace WindowsPhoneSpeedyBlupi Text.DrawText(pixmap, pos, MyResource.LoadString(MyResource.TX_TRIAL5), 0.7); pos.Y += 25; Text.DrawText(pixmap, pos, MyResource.LoadString(MyResource.TX_TRIAL6), 0.7); - DrawTextUnderButton(Def.ButtonGlygh.TrialBuy, MyResource.TX_BUTTON_BUY); - DrawTextUnderButton(Def.ButtonGlygh.TrialCancel, MyResource.TX_BUTTON_BACK); + DrawTextUnderButton(Def.ButtonGlyph.TrialBuy, MyResource.TX_BUTTON_BUY); + DrawTextUnderButton(Def.ButtonGlyph.TrialCancel, MyResource.TX_BUTTON_BACK); } if (phase == Def.Phase.Ranking) { - DrawTextUnderButton(Def.ButtonGlygh.RankingContinue, MyResource.TX_BUTTON_BACK); + DrawTextUnderButton(Def.ButtonGlyph.RankingContinue, MyResource.TX_BUTTON_BACK); } } - private void DrawButtonGamerText(Def.ButtonGlygh glyph, int gamer) + private void DrawButtonGamerText(Def.ButtonGlyph glyph, int gamer) { TinyRect buttonRect = inputPad.GetButtonRect(glyph); int nbVies; @@ -813,12 +813,12 @@ namespace WindowsPhoneSpeedyBlupi Text.DrawText(pixmap, pos, text, 0.45); } - private void DrawTextRightButton(Def.ButtonGlygh glyph, int res) + private void DrawTextRightButton(Def.ButtonGlyph glyph, int res) { DrawTextRightButton(glyph, MyResource.LoadString(res)); } - private void DrawTextRightButton(Def.ButtonGlygh glyph, string text) + private void DrawTextRightButton(Def.ButtonGlyph glyph, string text) { TinyRect buttonRect = inputPad.GetButtonRect(glyph); string[] array = text.Split('\n'); @@ -842,7 +842,7 @@ namespace WindowsPhoneSpeedyBlupi } } - private void DrawTextUnderButton(Def.ButtonGlygh glyph, int res) + private void DrawTextUnderButton(Def.ButtonGlyph glyph, int res) { TinyRect buttonRect = inputPad.GetButtonRect(glyph); TinyPoint tinyPoint = default(TinyPoint); diff --git a/InputPad.cs b/InputPad.cs index 92efd92..5e752d0 100644 --- a/InputPad.cs +++ b/InputPad.cs @@ -7,7 +7,6 @@ using System.Linq; using Microsoft.Devices.Sensors; using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input.Touch; -using WindowsPhoneSpeedyBlupi; using static WindowsPhoneSpeedyBlupi.Def; namespace WindowsPhoneSpeedyBlupi @@ -26,7 +25,7 @@ namespace WindowsPhoneSpeedyBlupi private readonly GameData gameData; - private readonly List pressedGlyphs; + private readonly List pressedGlyphs; private readonly Accelerometer accelSensor; @@ -38,9 +37,9 @@ namespace WindowsPhoneSpeedyBlupi private TinyPoint padTouchPos; - private Def.ButtonGlygh lastButtonDown; + private Def.ButtonGlyph lastButtonDown; - private Def.ButtonGlygh buttonPressed; + private Def.ButtonGlyph buttonPressed; private int touchCount; @@ -70,12 +69,12 @@ namespace WindowsPhoneSpeedyBlupi } } - public Def.ButtonGlygh ButtonPressed + public Def.ButtonGlyph ButtonPressed { get { - Def.ButtonGlygh result = buttonPressed; - buttonPressed = Def.ButtonGlygh.None; + Def.ButtonGlyph result = buttonPressed; + buttonPressed = Def.ButtonGlyph.None; return result; } } @@ -92,117 +91,110 @@ namespace WindowsPhoneSpeedyBlupi } } - private IEnumerable ButtonGlyphs + private IEnumerable ButtonGlyphs { get { switch (Phase) { case Def.Phase.Init: - yield return Def.ButtonGlygh.InitGamerA; - yield return Def.ButtonGlygh.InitGamerB; - yield return Def.ButtonGlygh.InitGamerC; - yield return Def.ButtonGlygh.InitSetup; - yield return Def.ButtonGlygh.InitPlay; + yield return Def.ButtonGlyph.InitGamerA; + yield return Def.ButtonGlyph.InitGamerB; + yield return Def.ButtonGlyph.InitGamerC; + yield return Def.ButtonGlyph.InitSetup; + yield return Def.ButtonGlyph.InitPlay; if (game1.IsTrialMode) { - yield return Def.ButtonGlygh.InitBuy; + yield return Def.ButtonGlyph.InitBuy; } if (game1.IsRankingMode) { - yield return Def.ButtonGlygh.InitRanking; + yield return Def.ButtonGlyph.InitRanking; } break; case Def.Phase.Play: - yield return Def.ButtonGlygh.PlayPause; - yield return Def.ButtonGlygh.PlayAction; - yield return Def.ButtonGlygh.PlayJump; + yield return Def.ButtonGlyph.PlayPause; + yield return Def.ButtonGlyph.PlayAction; + yield return Def.ButtonGlyph.PlayJump; if (accelStarted) { - yield return Def.ButtonGlygh.PlayDown; + yield return Def.ButtonGlyph.PlayDown; } - yield return Def.ButtonGlygh.Cheat11; - yield return Def.ButtonGlygh.Cheat12; - yield return Def.ButtonGlygh.Cheat21; - yield return Def.ButtonGlygh.Cheat22; - yield return Def.ButtonGlygh.Cheat31; - yield return Def.ButtonGlygh.Cheat32; + yield return Def.ButtonGlyph.Cheat11; + yield return Def.ButtonGlyph.Cheat12; + yield return Def.ButtonGlyph.Cheat21; + yield return Def.ButtonGlyph.Cheat22; + yield return Def.ButtonGlyph.Cheat31; + yield return Def.ButtonGlyph.Cheat32; break; case Def.Phase.Pause: - yield return Def.ButtonGlygh.PauseMenu; + yield return Def.ButtonGlyph.PauseMenu; if (mission != 1) { - yield return Def.ButtonGlygh.PauseBack; + yield return Def.ButtonGlyph.PauseBack; } - yield return Def.ButtonGlygh.PauseSetup; + yield return Def.ButtonGlyph.PauseSetup; if (mission != 1 && mission % 10 != 0) { - yield return Def.ButtonGlygh.PauseRestart; + yield return Def.ButtonGlyph.PauseRestart; } - yield return Def.ButtonGlygh.PauseContinue; + yield return Def.ButtonGlyph.PauseContinue; break; case Def.Phase.Resume: - yield return Def.ButtonGlygh.ResumeMenu; - yield return Def.ButtonGlygh.ResumeContinue; + yield return Def.ButtonGlyph.ResumeMenu; + yield return Def.ButtonGlyph.ResumeContinue; break; case Def.Phase.Lost: case Def.Phase.Win: - yield return Def.ButtonGlygh.WinLostReturn; + yield return Def.ButtonGlyph.WinLostReturn; break; case Def.Phase.Trial: - yield return Def.ButtonGlygh.TrialBuy; - yield return Def.ButtonGlygh.TrialCancel; + yield return Def.ButtonGlyph.TrialBuy; + yield return Def.ButtonGlyph.TrialCancel; break; case Def.Phase.MainSetup: - yield return Def.ButtonGlygh.SetupSounds; - yield return Def.ButtonGlygh.SetupJump; - yield return Def.ButtonGlygh.SetupZoom; - yield return Def.ButtonGlygh.SetupAccel; - yield return Def.ButtonGlygh.SetupReset; - yield return Def.ButtonGlygh.SetupReturn; + yield return Def.ButtonGlyph.SetupSounds; + yield return Def.ButtonGlyph.SetupJump; + yield return Def.ButtonGlyph.SetupZoom; + yield return Def.ButtonGlyph.SetupAccel; + yield return Def.ButtonGlyph.SetupReset; + yield return Def.ButtonGlyph.SetupReturn; break; case Def.Phase.PlaySetup: - yield return Def.ButtonGlygh.SetupSounds; - yield return Def.ButtonGlygh.SetupJump; - yield return Def.ButtonGlygh.SetupZoom; - yield return Def.ButtonGlygh.SetupAccel; - yield return Def.ButtonGlygh.SetupReturn; + yield return Def.ButtonGlyph.SetupSounds; + yield return Def.ButtonGlyph.SetupJump; + yield return Def.ButtonGlyph.SetupZoom; + yield return Def.ButtonGlyph.SetupAccel; + yield return Def.ButtonGlyph.SetupReturn; break; case Def.Phase.Ranking: - yield return Def.ButtonGlygh.RankingContinue; + yield return Def.ButtonGlyph.RankingContinue; break; } if (showCheatMenu) { - yield return Def.ButtonGlygh.Cheat1; - yield return Def.ButtonGlygh.Cheat2; - yield return Def.ButtonGlygh.Cheat3; - yield return Def.ButtonGlygh.Cheat4; - yield return Def.ButtonGlygh.Cheat5; - yield return Def.ButtonGlygh.Cheat6; - yield return Def.ButtonGlygh.Cheat7; - yield return Def.ButtonGlygh.Cheat8; - yield return Def.ButtonGlygh.Cheat9; + yield return Def.ButtonGlyph.Cheat1; + yield return Def.ButtonGlyph.Cheat2; + yield return Def.ButtonGlyph.Cheat3; + yield return Def.ButtonGlyph.Cheat4; + yield return Def.ButtonGlyph.Cheat5; + yield return Def.ButtonGlyph.Cheat6; + yield return Def.ButtonGlyph.Cheat7; + yield return Def.ButtonGlyph.Cheat8; + yield return Def.ButtonGlyph.Cheat9; } } } - + /// + /// Returns the point of the cente of the pad on the screen. + /// private TinyPoint PadCenter { get { TinyRect drawBounds = pixmap.DrawBounds; - if (gameData.JumpRight) - { - TinyPoint result = default(TinyPoint); - result.X = 100; - result.Y = drawBounds.Height - 100; - return result; - } - TinyPoint result2 = default(TinyPoint); - result2.X = drawBounds.Width - 100; - result2.Y = drawBounds.Height - 100; - return result2; + int x = gameData.JumpRight ? 100 : drawBounds.Width - 100; + return new TinyPoint(x, drawBounds.Height - 100); } } @@ -215,20 +207,12 @@ namespace WindowsPhoneSpeedyBlupi this.pixmap = pixmap; this.sound = sound; this.gameData = gameData; - pressedGlyphs = new List(); + pressedGlyphs = new List(); accelSensor = new Accelerometer(); ((SensorBase)(object)accelSensor).CurrentValueChanged += HandleAccelSensorCurrentValueChanged; - accelSlider = new Slider - { - TopLeftCorner = new TinyPoint - { - X = 320, - Y = 400 - }, - Value = this.gameData.AccelSensitivity - }; - lastButtonDown = Def.ButtonGlygh.None; - buttonPressed = Def.ButtonGlygh.None; + accelSlider = new Slider(new TinyPoint(320, 400), this.gameData.AccelSensitivity); + lastButtonDown = Def.ButtonGlyph.None; + buttonPressed = Def.ButtonGlyph.None; } public void StartMission(int mission) @@ -237,13 +221,6 @@ namespace WindowsPhoneSpeedyBlupi accelWaitZero = true; } - private TinyPoint createTinyPoint(int x, int y) - { - TinyPoint tinyPoint = new TinyPoint(); - tinyPoint.X = x; - tinyPoint.Y = y; - return tinyPoint; - } public void Update() { pressedGlyphs.Clear(); @@ -263,7 +240,7 @@ namespace WindowsPhoneSpeedyBlupi double verticalChange = 0.0; int num3 = 0; padPressed = false; - Def.ButtonGlygh buttonGlygh = Def.ButtonGlygh.None; + Def.ButtonGlyph buttonGlyph = Def.ButtonGlyph.None; TouchCollection touches = TouchPanel.GetState(); touchCount = touches.Count; List touchesOrClicks = new List(); @@ -271,10 +248,8 @@ namespace WindowsPhoneSpeedyBlupi { if (item.State == TouchLocationState.Pressed || item.State == TouchLocationState.Moved) { - TinyPoint tinyPoint = default(TinyPoint); - tinyPoint.X = (int)item.Position.X; - tinyPoint.Y = (int)item.Position.Y; - touchesOrClicks.Add(tinyPoint); + TinyPoint touchPress = new TinyPoint((int)item.Position.X, (int)item.Position.Y); + touchesOrClicks.Add(touchPress); } } @@ -282,10 +257,8 @@ namespace WindowsPhoneSpeedyBlupi if (mouseState.LeftButton == ButtonState.Pressed) { touchCount++; - TinyPoint click = new TinyPoint(); - click.X = mouseState.X; - click.Y = mouseState.Y; - touchesOrClicks.Add(click); + TinyPoint mouseClick = new TinyPoint(mouseState.X, mouseState.Y); + touchesOrClicks.Add(mouseClick); } float screenWidth = game1.getGraphics().GraphicsDevice.Viewport.Width; @@ -326,16 +299,12 @@ namespace WindowsPhoneSpeedyBlupi } } - KeyboardState newState = Keyboard.GetState(); - { - if (newState.IsKeyDown(Keys.LeftControl)) touchesOrClicks.Add(createTinyPoint(-1, (int) KeyboardPress.LeftControl)); - if (newState.IsKeyDown(Keys.Up)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Up)); - if (newState.IsKeyDown(Keys.Right)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Right)); - if (newState.IsKeyDown(Keys.Down)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Down)); - if (newState.IsKeyDown(Keys.Left)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Left)); - if (newState.IsKeyDown(Keys.Space)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Space)); + KeyboardState newKeyboardState = Keyboard.GetState(); + Keys[] keysToBeChecked = new Keys[6] { Keys.LeftControl, Keys.Up, Keys.Right, Keys.Down, Keys.Left, Keys.Space }; + foreach(Keys keys in keysToBeChecked) { + if (newKeyboardState.IsKeyDown(keys)) touchesOrClicks.Add(new TinyPoint(-1, (int)keys)); } - if (newState.IsKeyDown(Keys.F11)) + if (newKeyboardState.IsKeyDown(Keys.F11)) { game1.ToggleFullScreen (); Debug.WriteLine("F11 was pressed."); @@ -352,36 +321,36 @@ namespace WindowsPhoneSpeedyBlupi { keyboardPressed = true; } - KeyboardPress keyboardPress = keyboardPressed ? (KeyboardPress)touchOrClick.Y : KeyboardPress.None; - keyPressedUp = keyboardPress == KeyboardPress.Up ? true : keyPressedUp; - keyPressedDown = keyboardPress == KeyboardPress.Down ? true : keyPressedDown; - keyPressedLeft = keyboardPress == KeyboardPress.Left ? true : keyPressedLeft; - keyPressedRight = keyboardPress == KeyboardPress.Right ? true : keyPressedRight; + Keys keyPressed = keyboardPressed ? (Keys)touchOrClick.Y : Keys.None; + keyPressedUp = keyPressed == Keys.Up ? true : keyPressedUp; + keyPressedDown = keyPressed == Keys.Down ? true : keyPressedDown; + keyPressedLeft = keyPressed == Keys.Left ? true : keyPressedLeft; + keyPressedRight = keyPressed == Keys.Right ? true : keyPressedRight; { - TinyPoint tinyPoint2 = keyboardPressed ? createTinyPoint(1, 1) : touchOrClick; + TinyPoint tinyPoint2 = keyboardPressed ? new TinyPoint(1, 1) : touchOrClick; if (!accelStarted && Misc.IsInside(GetPadBounds(PadCenter, padSize), tinyPoint2)) { padPressed = true; padTouchPos = tinyPoint2; } - if (keyboardPress == KeyboardPress.Up || keyboardPress == KeyboardPress.Right || keyboardPress == KeyboardPress.Down || keyboardPress == KeyboardPress.Left) + if (keyPressed == Keys.Up || keyPressed == Keys.Right || keyPressed == Keys.Down || keyPressed == Keys.Left) { padPressed = true; } Debug.WriteLine("padPressed=" + padPressed); - Def.ButtonGlygh buttonGlygh2 = ButtonDetect(tinyPoint2); - Debug.WriteLine("buttonGlyph2 =" + buttonGlygh2); - if (buttonGlygh2 != 0) + Def.ButtonGlyph buttonGlyph2 = ButtonDetect(tinyPoint2); + Debug.WriteLine("buttonGlyph2 =" + buttonGlyph2); + if (buttonGlyph2 != 0) { - pressedGlyphs.Add(buttonGlygh2); + pressedGlyphs.Add(buttonGlyph2); } if (keyboardPressed) { - switch (keyboardPress) + switch (keyPressed) { - case KeyboardPress.LeftControl: buttonGlygh2 = Def.ButtonGlygh.PlayJump; pressedGlyphs.Add(buttonGlygh2); break; - case KeyboardPress.Space: buttonGlygh2 = Def.ButtonGlygh.PlayAction; pressedGlyphs.Add(buttonGlygh2); break; + case Keys.LeftControl: buttonGlyph2 = Def.ButtonGlyph.PlayJump; pressedGlyphs.Add(buttonGlyph2); break; + case Keys.Space: buttonGlyph2 = Def.ButtonGlyph.PlayAction; pressedGlyphs.Add(buttonGlyph2); break; } } @@ -389,66 +358,66 @@ namespace WindowsPhoneSpeedyBlupi { gameData.AccelSensitivity = accelSlider.Value; } - switch (buttonGlygh2) + switch (buttonGlyph2) { - case Def.ButtonGlygh.PlayJump: + case Def.ButtonGlyph.PlayJump: Debug.WriteLine("Jumping detected"); accelWaitZero = false; num3 |= 1; break; - case Def.ButtonGlygh.PlayDown: + case Def.ButtonGlyph.PlayDown: accelWaitZero = false; num3 |= 4; break; - case Def.ButtonGlygh.InitGamerA: - case Def.ButtonGlygh.InitGamerB: - case Def.ButtonGlygh.InitGamerC: - case Def.ButtonGlygh.InitSetup: - case Def.ButtonGlygh.InitPlay: - case Def.ButtonGlygh.InitBuy: - case Def.ButtonGlygh.InitRanking: - case Def.ButtonGlygh.WinLostReturn: - case Def.ButtonGlygh.TrialBuy: - case Def.ButtonGlygh.TrialCancel: - case Def.ButtonGlygh.SetupSounds: - case Def.ButtonGlygh.SetupJump: - case Def.ButtonGlygh.SetupZoom: - case Def.ButtonGlygh.SetupAccel: - case Def.ButtonGlygh.SetupReset: - case Def.ButtonGlygh.SetupReturn: - case Def.ButtonGlygh.PauseMenu: - case Def.ButtonGlygh.PauseBack: - case Def.ButtonGlygh.PauseSetup: - case Def.ButtonGlygh.PauseRestart: - case Def.ButtonGlygh.PauseContinue: - case Def.ButtonGlygh.PlayPause: - case Def.ButtonGlygh.PlayAction: - case Def.ButtonGlygh.ResumeMenu: - case Def.ButtonGlygh.ResumeContinue: - case Def.ButtonGlygh.RankingContinue: - case Def.ButtonGlygh.Cheat11: - case Def.ButtonGlygh.Cheat12: - case Def.ButtonGlygh.Cheat21: - case Def.ButtonGlygh.Cheat22: - case Def.ButtonGlygh.Cheat31: - case Def.ButtonGlygh.Cheat32: - case Def.ButtonGlygh.Cheat1: - case Def.ButtonGlygh.Cheat2: - case Def.ButtonGlygh.Cheat3: - case Def.ButtonGlygh.Cheat4: - case Def.ButtonGlygh.Cheat5: - case Def.ButtonGlygh.Cheat6: - case Def.ButtonGlygh.Cheat7: - case Def.ButtonGlygh.Cheat8: - case Def.ButtonGlygh.Cheat9: + case Def.ButtonGlyph.InitGamerA: + case Def.ButtonGlyph.InitGamerB: + case Def.ButtonGlyph.InitGamerC: + case Def.ButtonGlyph.InitSetup: + case Def.ButtonGlyph.InitPlay: + case Def.ButtonGlyph.InitBuy: + case Def.ButtonGlyph.InitRanking: + case Def.ButtonGlyph.WinLostReturn: + case Def.ButtonGlyph.TrialBuy: + case Def.ButtonGlyph.TrialCancel: + case Def.ButtonGlyph.SetupSounds: + case Def.ButtonGlyph.SetupJump: + case Def.ButtonGlyph.SetupZoom: + case Def.ButtonGlyph.SetupAccel: + case Def.ButtonGlyph.SetupReset: + case Def.ButtonGlyph.SetupReturn: + case Def.ButtonGlyph.PauseMenu: + case Def.ButtonGlyph.PauseBack: + case Def.ButtonGlyph.PauseSetup: + case Def.ButtonGlyph.PauseRestart: + case Def.ButtonGlyph.PauseContinue: + case Def.ButtonGlyph.PlayPause: + case Def.ButtonGlyph.PlayAction: + case Def.ButtonGlyph.ResumeMenu: + case Def.ButtonGlyph.ResumeContinue: + case Def.ButtonGlyph.RankingContinue: + case Def.ButtonGlyph.Cheat11: + case Def.ButtonGlyph.Cheat12: + case Def.ButtonGlyph.Cheat21: + case Def.ButtonGlyph.Cheat22: + case Def.ButtonGlyph.Cheat31: + case Def.ButtonGlyph.Cheat32: + case Def.ButtonGlyph.Cheat1: + case Def.ButtonGlyph.Cheat2: + case Def.ButtonGlyph.Cheat3: + case Def.ButtonGlyph.Cheat4: + case Def.ButtonGlyph.Cheat5: + case Def.ButtonGlyph.Cheat6: + case Def.ButtonGlyph.Cheat7: + case Def.ButtonGlyph.Cheat8: + case Def.ButtonGlyph.Cheat9: accelWaitZero = false; - buttonGlygh = buttonGlygh2; + buttonGlyph = buttonGlyph2; showCheatMenu = false; break; } } } - if (buttonGlygh != 0 && buttonGlygh != Def.ButtonGlygh.PlayAction && buttonGlygh != Def.ButtonGlygh.Cheat11 && buttonGlygh != Def.ButtonGlygh.Cheat12 && buttonGlygh != Def.ButtonGlygh.Cheat21 && buttonGlygh != Def.ButtonGlygh.Cheat22 && buttonGlygh != Def.ButtonGlygh.Cheat31 && buttonGlygh != Def.ButtonGlygh.Cheat32 && lastButtonDown == Def.ButtonGlygh.None) + if (buttonGlyph != 0 && buttonGlyph != Def.ButtonGlyph.PlayAction && buttonGlyph != Def.ButtonGlyph.Cheat11 && buttonGlyph != Def.ButtonGlyph.Cheat12 && buttonGlyph != Def.ButtonGlyph.Cheat21 && buttonGlyph != Def.ButtonGlyph.Cheat22 && buttonGlyph != Def.ButtonGlyph.Cheat31 && buttonGlyph != Def.ButtonGlyph.Cheat32 && lastButtonDown == Def.ButtonGlyph.None) { TinyPoint tinyPoint3 = default(TinyPoint); tinyPoint3.X = 320; @@ -456,11 +425,11 @@ namespace WindowsPhoneSpeedyBlupi TinyPoint pos = tinyPoint3; sound.PlayImage(0, pos); } - if (buttonGlygh == Def.ButtonGlygh.None && lastButtonDown != 0) + if (buttonGlyph == Def.ButtonGlyph.None && lastButtonDown != 0) { buttonPressed = lastButtonDown; } - lastButtonDown = buttonGlygh; + lastButtonDown = buttonGlyph; if (padPressed) { Debug.WriteLine("PadCenter.X=" + PadCenter.X); @@ -539,12 +508,12 @@ namespace WindowsPhoneSpeedyBlupi decor.KeyChange(num3); } - private Def.ButtonGlygh ButtonDetect(TinyPoint pos) + private Def.ButtonGlyph ButtonDetect(TinyPoint pos) { - foreach (Def.ButtonGlygh item in ButtonGlyphs.Reverse()) + foreach (Def.ButtonGlyph item in ButtonGlyphs.Reverse()) { int value = 0; - if (item == Def.ButtonGlygh.PlayJump || item == Def.ButtonGlygh.PlayAction || item == Def.ButtonGlygh.PlayDown || item == Def.ButtonGlygh.PlayPause) + if (item == Def.ButtonGlyph.PlayJump || item == Def.ButtonGlyph.PlayAction || item == Def.ButtonGlyph.PlayDown || item == Def.ButtonGlyph.PlayPause) { value = 20; } @@ -554,7 +523,7 @@ namespace WindowsPhoneSpeedyBlupi return item; } } - return Def.ButtonGlygh.None; + return Def.ButtonGlyph.None; } public void Draw() @@ -565,28 +534,28 @@ namespace WindowsPhoneSpeedyBlupi TinyPoint center = (padPressed ? padTouchPos : PadCenter); pixmap.DrawIcon(14, 1, GetPadBounds(center, padSize / 2), 1.0, false); } - foreach (Def.ButtonGlygh buttonGlyph in ButtonGlyphs) + foreach (Def.ButtonGlyph buttonGlyph in ButtonGlyphs) { bool pressed = pressedGlyphs.Contains(buttonGlyph); bool selected = false; - if (buttonGlyph >= Def.ButtonGlygh.InitGamerA && buttonGlyph <= Def.ButtonGlygh.InitGamerC) + if (buttonGlyph >= Def.ButtonGlyph.InitGamerA && buttonGlyph <= Def.ButtonGlyph.InitGamerC) { int num = (int)(buttonGlyph - 1); selected = num == gameData.SelectedGamer; } - if (buttonGlyph == Def.ButtonGlygh.SetupSounds) + if (buttonGlyph == Def.ButtonGlyph.SetupSounds) { selected = gameData.Sounds; } - if (buttonGlyph == Def.ButtonGlygh.SetupJump) + if (buttonGlyph == Def.ButtonGlyph.SetupJump) { selected = gameData.JumpRight; } - if (buttonGlyph == Def.ButtonGlygh.SetupZoom) + if (buttonGlyph == Def.ButtonGlyph.SetupZoom) { selected = gameData.AutoZoom; } - if (buttonGlyph == Def.ButtonGlygh.SetupAccel) + if (buttonGlyph == Def.ButtonGlyph.SetupAccel) { selected = gameData.AccelActive; } @@ -608,7 +577,7 @@ namespace WindowsPhoneSpeedyBlupi return result; } - public TinyRect GetButtonRect(Def.ButtonGlygh glyph) + public TinyRect GetButtonRect(Def.ButtonGlyph glyph) { TinyRect drawBounds = pixmap.DrawBounds; double num = drawBounds.Width; @@ -616,7 +585,7 @@ namespace WindowsPhoneSpeedyBlupi double num3 = num2 / 5.0; double num4 = num2 * 140.0 / 480.0; double num5 = num2 / 3.5; - if (glyph >= Def.ButtonGlygh.Cheat1 && glyph <= Def.ButtonGlygh.Cheat9) + if (glyph >= Def.ButtonGlyph.Cheat1 && glyph <= Def.ButtonGlyph.Cheat9) { int num6 = (int)(glyph - 35); TinyRect result = default(TinyRect); @@ -628,7 +597,7 @@ namespace WindowsPhoneSpeedyBlupi } switch (glyph) { - case Def.ButtonGlygh.InitGamerA: + case Def.ButtonGlyph.InitGamerA: { TinyRect result19 = default(TinyRect); result19.Left = (int)(20.0 + num4 * 0.0); @@ -637,7 +606,7 @@ namespace WindowsPhoneSpeedyBlupi result19.Bottom = (int)(num2 - 20.0 - num4 * 1.6); return result19; } - case Def.ButtonGlygh.InitGamerB: + case Def.ButtonGlyph.InitGamerB: { TinyRect result18 = default(TinyRect); result18.Left = (int)(20.0 + num4 * 0.0); @@ -646,7 +615,7 @@ namespace WindowsPhoneSpeedyBlupi result18.Bottom = (int)(num2 - 20.0 - num4 * 1.1); return result18; } - case Def.ButtonGlygh.InitGamerC: + case Def.ButtonGlyph.InitGamerC: { TinyRect result15 = default(TinyRect); result15.Left = (int)(20.0 + num4 * 0.0); @@ -655,7 +624,7 @@ namespace WindowsPhoneSpeedyBlupi result15.Bottom = (int)(num2 - 20.0 - num4 * 0.6); return result15; } - case Def.ButtonGlygh.InitSetup: + case Def.ButtonGlyph.InitSetup: { TinyRect result14 = default(TinyRect); result14.Left = (int)(20.0 + num4 * 0.0); @@ -664,7 +633,7 @@ namespace WindowsPhoneSpeedyBlupi result14.Bottom = (int)(num2 - 20.0 - num4 * 0.0); return result14; } - case Def.ButtonGlygh.InitPlay: + case Def.ButtonGlyph.InitPlay: { TinyRect result11 = default(TinyRect); result11.Left = (int)(num - 20.0 - num4 * 1.0); @@ -673,8 +642,8 @@ namespace WindowsPhoneSpeedyBlupi result11.Bottom = (int)(num2 - 40.0 - num4 * 0.0); return result11; } - case Def.ButtonGlygh.InitBuy: - case Def.ButtonGlygh.InitRanking: + case Def.ButtonGlyph.InitBuy: + case Def.ButtonGlyph.InitRanking: { TinyRect result10 = default(TinyRect); result10.Left = (int)(num - 20.0 - num4 * 0.75); @@ -683,7 +652,7 @@ namespace WindowsPhoneSpeedyBlupi result10.Bottom = (int)(num2 - 20.0 - num4 * 1.6); return result10; } - case Def.ButtonGlygh.PauseMenu: + case Def.ButtonGlyph.PauseMenu: { TinyRect result37 = default(TinyRect); result37.Left = (int)((double)PixmapOrigin.X + num4 * -0.21); @@ -692,7 +661,7 @@ namespace WindowsPhoneSpeedyBlupi result37.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2); return result37; } - case Def.ButtonGlygh.PauseBack: + case Def.ButtonGlyph.PauseBack: { TinyRect result36 = default(TinyRect); result36.Left = (int)((double)PixmapOrigin.X + num4 * 0.79); @@ -701,7 +670,7 @@ namespace WindowsPhoneSpeedyBlupi result36.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2); return result36; } - case Def.ButtonGlygh.PauseSetup: + case Def.ButtonGlyph.PauseSetup: { TinyRect result35 = default(TinyRect); result35.Left = (int)((double)PixmapOrigin.X + num4 * 1.79); @@ -710,7 +679,7 @@ namespace WindowsPhoneSpeedyBlupi result35.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2); return result35; } - case Def.ButtonGlygh.PauseRestart: + case Def.ButtonGlyph.PauseRestart: { TinyRect result34 = default(TinyRect); result34.Left = (int)((double)PixmapOrigin.X + num4 * 2.79); @@ -719,7 +688,7 @@ namespace WindowsPhoneSpeedyBlupi result34.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2); return result34; } - case Def.ButtonGlygh.PauseContinue: + case Def.ButtonGlyph.PauseContinue: { TinyRect result33 = default(TinyRect); result33.Left = (int)((double)PixmapOrigin.X + num4 * 3.79); @@ -728,7 +697,7 @@ namespace WindowsPhoneSpeedyBlupi result33.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2); return result33; } - case Def.ButtonGlygh.ResumeMenu: + case Def.ButtonGlyph.ResumeMenu: { TinyRect result32 = default(TinyRect); result32.Left = (int)((double)PixmapOrigin.X + num4 * 1.29); @@ -737,7 +706,7 @@ namespace WindowsPhoneSpeedyBlupi result32.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2); return result32; } - case Def.ButtonGlygh.ResumeContinue: + case Def.ButtonGlyph.ResumeContinue: { TinyRect result31 = default(TinyRect); result31.Left = (int)((double)PixmapOrigin.X + num4 * 2.29); @@ -746,7 +715,7 @@ namespace WindowsPhoneSpeedyBlupi result31.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2); return result31; } - case Def.ButtonGlygh.WinLostReturn: + case Def.ButtonGlyph.WinLostReturn: { TinyRect result30 = default(TinyRect); result30.Left = (int)((double)PixmapOrigin.X + num - num3 * 2.2); @@ -755,7 +724,7 @@ namespace WindowsPhoneSpeedyBlupi result30.Bottom = (int)((double)PixmapOrigin.Y + num3 * 1.2); return result30; } - case Def.ButtonGlygh.TrialBuy: + case Def.ButtonGlyph.TrialBuy: { TinyRect result29 = default(TinyRect); result29.Left = (int)((double)PixmapOrigin.X + num4 * 2.5); @@ -764,7 +733,7 @@ namespace WindowsPhoneSpeedyBlupi result29.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.1); return result29; } - case Def.ButtonGlygh.TrialCancel: + case Def.ButtonGlyph.TrialCancel: { TinyRect result28 = default(TinyRect); result28.Left = (int)((double)PixmapOrigin.X + num4 * 3.5); @@ -773,7 +742,7 @@ namespace WindowsPhoneSpeedyBlupi result28.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.1); return result28; } - case Def.ButtonGlygh.RankingContinue: + case Def.ButtonGlyph.RankingContinue: { TinyRect result27 = default(TinyRect); result27.Left = (int)((double)PixmapOrigin.X + num4 * 3.5); @@ -782,7 +751,7 @@ namespace WindowsPhoneSpeedyBlupi result27.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.1); return result27; } - case Def.ButtonGlygh.SetupSounds: + case Def.ButtonGlyph.SetupSounds: { TinyRect result26 = default(TinyRect); result26.Left = (int)(20.0 + num4 * 0.0); @@ -791,7 +760,7 @@ namespace WindowsPhoneSpeedyBlupi result26.Bottom = (int)(num2 - 20.0 - num4 * 1.5); return result26; } - case Def.ButtonGlygh.SetupJump: + case Def.ButtonGlyph.SetupJump: { TinyRect result25 = default(TinyRect); result25.Left = (int)(20.0 + num4 * 0.0); @@ -800,7 +769,7 @@ namespace WindowsPhoneSpeedyBlupi result25.Bottom = (int)(num2 - 20.0 - num4 * 1.0); return result25; } - case Def.ButtonGlygh.SetupZoom: + case Def.ButtonGlyph.SetupZoom: { TinyRect result24 = default(TinyRect); result24.Left = (int)(20.0 + num4 * 0.0); @@ -809,7 +778,7 @@ namespace WindowsPhoneSpeedyBlupi result24.Bottom = (int)(num2 - 20.0 - num4 * 0.5); return result24; } - case Def.ButtonGlygh.SetupAccel: + case Def.ButtonGlyph.SetupAccel: { TinyRect result23 = default(TinyRect); result23.Left = (int)(20.0 + num4 * 0.0); @@ -818,7 +787,7 @@ namespace WindowsPhoneSpeedyBlupi result23.Bottom = (int)(num2 - 20.0 - num4 * 0.0); return result23; } - case Def.ButtonGlygh.SetupReset: + case Def.ButtonGlyph.SetupReset: { TinyRect result22 = default(TinyRect); result22.Left = (int)(450.0 + num4 * 0.0); @@ -827,7 +796,7 @@ namespace WindowsPhoneSpeedyBlupi result22.Bottom = (int)(num2 - 20.0 - num4 * 1.5); return result22; } - case Def.ButtonGlygh.SetupReturn: + case Def.ButtonGlyph.SetupReturn: { TinyRect result21 = default(TinyRect); result21.Left = (int)(num - 20.0 - num4 * 0.8); @@ -836,7 +805,7 @@ namespace WindowsPhoneSpeedyBlupi result21.Bottom = (int)(num2 - 20.0 - num4 * 0.0); return result21; } - case Def.ButtonGlygh.PlayPause: + case Def.ButtonGlyph.PlayPause: { TinyRect result20 = default(TinyRect); result20.Left = (int)(num - num3 * 0.7); @@ -845,7 +814,7 @@ namespace WindowsPhoneSpeedyBlupi result20.Bottom = (int)(num3 * 0.7); return result20; } - case Def.ButtonGlygh.PlayAction: + case Def.ButtonGlyph.PlayAction: { if (gameData.JumpRight) { @@ -863,7 +832,7 @@ namespace WindowsPhoneSpeedyBlupi result17.Bottom = (int)(num2 - num3 * 1.6); return result17; } - case Def.ButtonGlygh.PlayJump: + case Def.ButtonGlyph.PlayJump: { if (gameData.JumpRight) { @@ -881,7 +850,7 @@ namespace WindowsPhoneSpeedyBlupi result13.Bottom = (int)(num2 - num3 * 0.2); return result13; } - case Def.ButtonGlygh.PlayDown: + case Def.ButtonGlyph.PlayDown: { if (gameData.JumpRight) { @@ -899,7 +868,7 @@ namespace WindowsPhoneSpeedyBlupi result9.Bottom = (int)(num2 - num3 * 0.2); return result9; } - case Def.ButtonGlygh.Cheat11: + case Def.ButtonGlyph.Cheat11: { TinyRect result7 = default(TinyRect); result7.Left = (int)(num5 * 0.0); @@ -908,7 +877,7 @@ namespace WindowsPhoneSpeedyBlupi result7.Bottom = (int)(num5 * 1.0); return result7; } - case Def.ButtonGlygh.Cheat12: + case Def.ButtonGlyph.Cheat12: { TinyRect result6 = default(TinyRect); result6.Left = (int)(num5 * 0.0); @@ -917,7 +886,7 @@ namespace WindowsPhoneSpeedyBlupi result6.Bottom = (int)(num5 * 2.0); return result6; } - case Def.ButtonGlygh.Cheat21: + case Def.ButtonGlyph.Cheat21: { TinyRect result5 = default(TinyRect); result5.Left = (int)(num5 * 1.0); @@ -926,7 +895,7 @@ namespace WindowsPhoneSpeedyBlupi result5.Bottom = (int)(num5 * 1.0); return result5; } - case Def.ButtonGlygh.Cheat22: + case Def.ButtonGlyph.Cheat22: { TinyRect result4 = default(TinyRect); result4.Left = (int)(num5 * 1.0); @@ -935,7 +904,7 @@ namespace WindowsPhoneSpeedyBlupi result4.Bottom = (int)(num5 * 2.0); return result4; } - case Def.ButtonGlygh.Cheat31: + case Def.ButtonGlyph.Cheat31: { TinyRect result3 = default(TinyRect); result3.Left = (int)(num5 * 2.0); @@ -944,7 +913,7 @@ namespace WindowsPhoneSpeedyBlupi result3.Bottom = (int)(num5 * 1.0); return result3; } - case Def.ButtonGlygh.Cheat32: + case Def.ButtonGlyph.Cheat32: { TinyRect result2 = default(TinyRect); result2.Left = (int)(num5 * 2.0); diff --git a/Microsoft.Xna.Framework.GamerServices/Guide.cs b/Microsoft.Xna.Framework.GamerServices/Guide.cs index 4b34bc2..51f291d 100644 --- a/Microsoft.Xna.Framework.GamerServices/Guide.cs +++ b/Microsoft.Xna.Framework.GamerServices/Guide.cs @@ -4,7 +4,7 @@ namespace Microsoft.Xna.Framework.GamerServices { public static class Guide { - public static void ShowMarketplace(PlayerIndex playerIndex) + public static void Show(PlayerIndex playerIndex) { Debug.Write("The Market Place should now be shown."); } diff --git a/Pixmap.cs b/Pixmap.cs index 74d33cb..eecee8a 100644 --- a/Pixmap.cs +++ b/Pixmap.cs @@ -126,87 +126,87 @@ namespace WindowsPhoneSpeedyBlupi hotSpotY = y; } - public void DrawInputButton(TinyRect rect, Def.ButtonGlygh glyph, bool pressed, bool selected) + public void DrawInputButton(TinyRect rect, Def.ButtonGlyph glyph, bool pressed, bool selected) { switch (glyph) { - case Def.ButtonGlygh.InitGamerA: + case Def.ButtonGlyph.InitGamerA: DrawIcon(14, selected ? 16 : 4, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.InitGamerB: + case Def.ButtonGlyph.InitGamerB: DrawIcon(14, selected ? 17 : 5, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.InitGamerC: + case Def.ButtonGlyph.InitGamerC: DrawIcon(14, selected ? 18 : 6, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.InitSetup: - case Def.ButtonGlygh.PauseSetup: + case Def.ButtonGlyph.InitSetup: + case Def.ButtonGlyph.PauseSetup: DrawIcon(14, 19, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.InitPlay: + case Def.ButtonGlyph.InitPlay: DrawIcon(14, 7, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.PauseMenu: - case Def.ButtonGlygh.ResumeMenu: + case Def.ButtonGlyph.PauseMenu: + case Def.ButtonGlyph.ResumeMenu: DrawIcon(14, 11, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.PauseBack: + case Def.ButtonGlyph.PauseBack: DrawIcon(14, 8, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.PauseRestart: + case Def.ButtonGlyph.PauseRestart: DrawIcon(14, 9, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.PauseContinue: - case Def.ButtonGlygh.ResumeContinue: + case Def.ButtonGlyph.PauseContinue: + case Def.ButtonGlyph.ResumeContinue: DrawIcon(14, 10, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.WinLostReturn: + case Def.ButtonGlyph.WinLostReturn: DrawIcon(14, 3, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.InitBuy: - case Def.ButtonGlygh.TrialBuy: + case Def.ButtonGlyph.InitBuy: + case Def.ButtonGlyph.TrialBuy: DrawIcon(14, 22, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.InitRanking: + case Def.ButtonGlyph.InitRanking: DrawIcon(14, 12, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.TrialCancel: - case Def.ButtonGlygh.RankingContinue: + case Def.ButtonGlyph.TrialCancel: + case Def.ButtonGlyph.RankingContinue: DrawIcon(14, 8, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.SetupSounds: - case Def.ButtonGlygh.SetupJump: - case Def.ButtonGlygh.SetupZoom: - case Def.ButtonGlygh.SetupAccel: + case Def.ButtonGlyph.SetupSounds: + case Def.ButtonGlyph.SetupJump: + case Def.ButtonGlyph.SetupZoom: + case Def.ButtonGlyph.SetupAccel: DrawIcon(14, selected ? 13 : 21, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.SetupReset: + case Def.ButtonGlyph.SetupReset: DrawIcon(14, 20, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.SetupReturn: + case Def.ButtonGlyph.SetupReturn: DrawIcon(14, 8, rect, pressed ? 0.8 : 1.0, false); break; - case Def.ButtonGlygh.PlayJump: + case Def.ButtonGlyph.PlayJump: DrawIcon(14, 2, rect, pressed ? 0.6 : 1.0, false); break; - case Def.ButtonGlygh.PlayAction: + case Def.ButtonGlyph.PlayAction: DrawIcon(14, 12, rect, pressed ? 0.6 : 1.0, false); break; - case Def.ButtonGlygh.PlayDown: + case Def.ButtonGlyph.PlayDown: DrawIcon(14, 23, rect, pressed ? 0.6 : 1.0, false); break; - case Def.ButtonGlygh.PlayPause: + case Def.ButtonGlyph.PlayPause: DrawIcon(14, 3, rect, pressed ? 0.6 : 1.0, false); break; - case Def.ButtonGlygh.Cheat1: - case Def.ButtonGlygh.Cheat2: - case Def.ButtonGlygh.Cheat3: - case Def.ButtonGlygh.Cheat4: - case Def.ButtonGlygh.Cheat5: - case Def.ButtonGlygh.Cheat6: - case Def.ButtonGlygh.Cheat7: - case Def.ButtonGlygh.Cheat8: - case Def.ButtonGlygh.Cheat9: + case Def.ButtonGlyph.Cheat1: + case Def.ButtonGlyph.Cheat2: + case Def.ButtonGlyph.Cheat3: + case Def.ButtonGlyph.Cheat4: + case Def.ButtonGlyph.Cheat5: + case Def.ButtonGlyph.Cheat6: + case Def.ButtonGlyph.Cheat7: + case Def.ButtonGlyph.Cheat8: + case Def.ButtonGlyph.Cheat9: { DrawIcon(14, 0, rect, pressed ? 0.6 : 1.0, false); TinyPoint tinyPoint = default(TinyPoint); @@ -216,12 +216,12 @@ namespace WindowsPhoneSpeedyBlupi Text.DrawTextCenter(this, pos, Decor.GetCheatTinyText(glyph), 1.0); break; } - case Def.ButtonGlygh.Cheat11: - case Def.ButtonGlygh.Cheat12: - case Def.ButtonGlygh.Cheat21: - case Def.ButtonGlygh.Cheat22: - case Def.ButtonGlygh.Cheat31: - case Def.ButtonGlygh.Cheat32: + case Def.ButtonGlyph.Cheat11: + case Def.ButtonGlyph.Cheat12: + case Def.ButtonGlyph.Cheat21: + case Def.ButtonGlyph.Cheat22: + case Def.ButtonGlyph.Cheat31: + case Def.ButtonGlyph.Cheat32: break; } } diff --git a/Slider.cs b/Slider.cs index ff6f9b5..57a0104 100644 --- a/Slider.cs +++ b/Slider.cs @@ -1,12 +1,16 @@ // WindowsPhoneSpeedyBlupi, Version=1.0.0.5, Culture=neutral, PublicKeyToken=6db12cd62dbec439 // WindowsPhoneSpeedyBlupi.Slider using System; -using WindowsPhoneSpeedyBlupi; namespace WindowsPhoneSpeedyBlupi { public class Slider { + public Slider(TinyPoint topLeftCorner, double value) { + TopLeftCorner = topLeftCorner; + value = Value; + + } public TinyPoint TopLeftCorner { get; set; } public double Value { get; set; } diff --git a/TinyPoint.cs b/TinyPoint.cs index 2c306e6..0ffb6e4 100644 --- a/TinyPoint.cs +++ b/TinyPoint.cs @@ -9,6 +9,11 @@ namespace WindowsPhoneSpeedyBlupi public int Y; + public TinyPoint(int x, int y) + { + X = x; Y = y; + } + public override string ToString() { return string.Format("{0};{1}", X, Y);