openeggbert/mobile-eggbert-monogame-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Some fixes and cleanup

Browse Source
This commit is contained in:
Robert Vokac 2024-12-21 19:35:59 +01:00
parent 76115df37d
commit 7acaf8ebe9
6 changed files with 34 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Def.cs
View File

@ -2,8 +2,9 @@
// WindowsPhoneSpeedyBlupi.Def // WindowsPhoneSpeedyBlupi.Def
namespace WindowsPhoneSpeedyBlupi namespace WindowsPhoneSpeedyBlupi
{ {
public static class Def public static class Def
{ {
@ -86,7 +87,7 @@ namespace WindowsPhoneSpeedyBlupi
public enum KeyboardPress public enum KeyboardPress
{ {
None, Up, Right, Down, Left, LeftControl, Space, Escape, Pause 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 LXIMAGE = 640;

12
Game1.cs
View File

@ -2,7 +2,7 @@
// WindowsPhoneSpeedyBlupi.Game1 // WindowsPhoneSpeedyBlupi.Game1
using System; using System;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
//using Microsoft.Xna.Framework.GamerServices;//todo remove me using Microsoft.Xna.Framework.GamerServices;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using Microsoft.Xna.Framework.Input.Touch; using Microsoft.Xna.Framework.Input.Touch;
using Microsoft.Xna.Framework.Media; using Microsoft.Xna.Framework.Media;
@ -298,7 +298,7 @@ namespace WindowsPhoneSpeedyBlupi
return; return;
case Def.ButtonGlygh.InitBuy: case Def.ButtonGlygh.InitBuy:
case Def.ButtonGlygh.TrialBuy: case Def.ButtonGlygh.TrialBuy:
MarketPlace.Show(PlayerIndex.One); Guide.Show(PlayerIndex.One);
SetPhase(Def.Phase.Init); SetPhase(Def.Phase.Init);
return; return;
case Def.ButtonGlygh.InitRanking: case Def.ButtonGlygh.InitRanking:
@ -924,7 +924,7 @@ namespace WindowsPhoneSpeedyBlupi
fadeOutPhase = Def.Phase.None; fadeOutPhase = Def.Phase.None;
inputPad.Phase = this.phase; inputPad.Phase = this.phase;
playSetup = this.phase == Def.Phase.PlaySetup; playSetup = this.phase == Def.Phase.PlaySetup;
isTrialMode = TrialMode.IsTrialModeEnabled(); isTrialMode = Guide.IsTrialMode;
phaseTime = 0; phaseTime = 0;
missionToStart2 = -1; missionToStart2 = -1;
decor.StopSound(); decor.StopSound();
@ -969,11 +969,7 @@ namespace WindowsPhoneSpeedyBlupi
decor.MemorizeDoors(gameData); decor.MemorizeDoors(gameData);
gameData.Write(); gameData.Write();
} }
//public void SetFullScreen(bool isFullScreen)
//{
// this.graphics.IsFullScreen = isFullScreen;
// graphics.ToggleFullScreen();
//}
public void ToggleFullScreen() public void ToggleFullScreen()
{ {
this.graphics.ToggleFullScreen(); this.graphics.ToggleFullScreen();

18
InputPad.cs
View File

@ -217,7 +217,7 @@ namespace WindowsPhoneSpeedyBlupi
this.gameData = gameData; this.gameData = gameData;
pressedGlyphs = new List<Def.ButtonGlygh>(); pressedGlyphs = new List<Def.ButtonGlygh>();
accelSensor = new Accelerometer(); accelSensor = new Accelerometer();
accelSensor.CurrentValueChanged += HandleAccelSensorCurrentValueChanged; ((SensorBase<AccelerometerReading>)(object)accelSensor).CurrentValueChanged += HandleAccelSensorCurrentValueChanged;
accelSlider = new Slider accelSlider = new Slider
{ {
TopLeftCorner = new TinyPoint TopLeftCorner = new TinyPoint
@ -292,7 +292,7 @@ namespace WindowsPhoneSpeedyBlupi
float screenHeight = game1.getGraphics().GraphicsDevice.Viewport.Height; float screenHeight = game1.getGraphics().GraphicsDevice.Viewport.Height;
float screenRatio = screenWidth / screenHeight; float screenRatio = screenWidth / screenHeight;
if (Def.PLATFORM == Platform.Android &&screenRatio < 1.3333333333333333) if (Def.PLATFORM == Platform.Android &&screenRatio > 1.3333333333333333)
{ {
for (int i = 0; i < touchesOrClicks.Count; i++) for (int i = 0; i < touchesOrClicks.Count; i++)
{ {
@ -328,12 +328,12 @@ namespace WindowsPhoneSpeedyBlupi
KeyboardState newState = Keyboard.GetState(); KeyboardState newState = Keyboard.GetState();
{ {
if (newState.IsKeyDown(Keys.LeftControl)) touchesOrClicks.Add(createTinyPoint(-1, Misc.keyboardPressToInt(KeyboardPress.LeftControl))); if (newState.IsKeyDown(Keys.LeftControl)) touchesOrClicks.Add(createTinyPoint(-1, (int) KeyboardPress.LeftControl));
if (newState.IsKeyDown(Keys.Up)) touchesOrClicks.Add(createTinyPoint(-1, Misc.keyboardPressToInt(KeyboardPress.Up))); if (newState.IsKeyDown(Keys.Up)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Up));
if (newState.IsKeyDown(Keys.Right)) touchesOrClicks.Add(createTinyPoint(-1, Misc.keyboardPressToInt(KeyboardPress.Right))); if (newState.IsKeyDown(Keys.Right)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Right));
if (newState.IsKeyDown(Keys.Down)) touchesOrClicks.Add(createTinyPoint(-1, Misc.keyboardPressToInt(KeyboardPress.Down))); if (newState.IsKeyDown(Keys.Down)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Down));
if (newState.IsKeyDown(Keys.Left)) touchesOrClicks.Add(createTinyPoint(-1, Misc.keyboardPressToInt(KeyboardPress.Left))); if (newState.IsKeyDown(Keys.Left)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Left));
if (newState.IsKeyDown(Keys.Space)) touchesOrClicks.Add(createTinyPoint(-1, Misc.keyboardPressToInt(KeyboardPress.Space))); if (newState.IsKeyDown(Keys.Space)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Space));
} }
if (newState.IsKeyDown(Keys.F11)) if (newState.IsKeyDown(Keys.F11))
{ {
@ -352,7 +352,7 @@ namespace WindowsPhoneSpeedyBlupi
{ {
keyboardPressed = true; keyboardPressed = true;
} }
KeyboardPress keyboardPress = keyboardPressed ? Misc.intToKeyboardPress(touchOrClick.Y) : KeyboardPress.None; KeyboardPress keyboardPress = keyboardPressed ? (KeyboardPress)touchOrClick.Y : KeyboardPress.None;
keyPressedUp = keyboardPress == KeyboardPress.Up ? true : keyPressedUp; keyPressedUp = keyboardPress == KeyboardPress.Up ? true : keyPressedUp;
keyPressedDown = keyboardPress == KeyboardPress.Down ? true : keyPressedDown; keyPressedDown = keyboardPress == KeyboardPress.Down ? true : keyPressedDown;
keyPressedLeft = keyboardPress == KeyboardPress.Left ? true : keyPressedLeft; keyPressedLeft = keyboardPress == KeyboardPress.Left ? true : keyPressedLeft;

13
Microsoft.Xna.Framework.GamerServices/Guide.cs Normal file
View File

@ -0,0 +1,13 @@
using System.Diagnostics;
namespace Microsoft.Xna.Framework.GamerServices
{
public static class Guide
{
public static void Show(PlayerIndex playerIndex)
{
Debug.Write("The Market Place should now be shown.");
}
public static bool IsTrialMode { get; set; }
}
}

10
TrialMode.cs → Microsoft.Xna.Framework.GamerServices/TrialMode.cs
View File

@ -1,9 +1,9 @@
using System; using System;
using System.IO; using System.IO;
namespace WindowsPhoneSpeedyBlupi namespace Xna.Framework.GamerServices
{ {
public class TrialMode internal class TrialMode
{ {
private static DateTime trialStartTime; private static DateTime trialStartTime;
@ -13,7 +13,7 @@ namespace WindowsPhoneSpeedyBlupi
trialStartTime = DateTime.Now; trialStartTime = DateTime.Now;
} }
public static Boolean IsTrialModeExpired() public static bool IsTrialModeExpired()
{ {
return IsTrialMode7DaysLimitExpired() || IsTrialMode10MinutesLimitExpired(); return IsTrialMode7DaysLimitExpired() || IsTrialMode10MinutesLimitExpired();
} }
@ -46,7 +46,7 @@ namespace WindowsPhoneSpeedyBlupi
private static int trialModeEnabled = -1; private static int trialModeEnabled = -1;
public static bool IsTrialModeEnabled() public static bool IsTrialModeEnabled()
{ {
if(trialModeEnabled == 1) if (trialModeEnabled == 1)
{ {
return true; return true;
} }
@ -55,7 +55,7 @@ namespace WindowsPhoneSpeedyBlupi
{ {
return false; return false;
} }
const string TRIAL_MODE_ENABLED_TXT = "trialModeEnabled.txt"; const string TRIAL_MODE_ENABLED_TXT = "trialModeEnabled.txt";
var trialModeEnabledString = File.Exists(TRIAL_MODE_ENABLED_TXT) ? File.ReadAllText(TRIAL_MODE_ENABLED_TXT) : "0"; var trialModeEnabledString = File.Exists(TRIAL_MODE_ENABLED_TXT) ? File.ReadAllText(TRIAL_MODE_ENABLED_TXT) : "0";
var trialModeEnabledLocal = trialModeEnabledString.Equals("1"); var trialModeEnabledLocal = trialModeEnabledString.Equals("1");

31
Misc.cs
View File

@ -122,36 +122,5 @@ namespace WindowsPhoneSpeedyBlupi
return true; return true;
} }
public static KeyboardPress intToKeyboardPress(int i) {
switch (i)
{
case 0: return KeyboardPress.None;
case 1: return KeyboardPress.Up;
case 2: return KeyboardPress.Right;
case 3: return KeyboardPress.Down;
case 4: return KeyboardPress.Left;
case 5: return KeyboardPress.LeftControl;
case 6: return KeyboardPress.Space;
case 7: return KeyboardPress.Escape;
case 8: return KeyboardPress.Pause;
default: Debug.WriteLine("Unsupported number for KeyboardPress: " + i); return KeyboardPress.None;
}
}
public static int keyboardPressToInt(KeyboardPress kp)
{
switch (kp)
{
case KeyboardPress.None: return 0;
case KeyboardPress.Up: return 1;
case KeyboardPress.Right: return 2;
case KeyboardPress.Down: return 3;
case KeyboardPress.Left: return 4;
case KeyboardPress.LeftControl: return 5;
case KeyboardPress.Space: return 6;
case KeyboardPress.Escape: return 7;
case KeyboardPress.Pause: return 8;
default: throw new Exception("Unsupported KeyboardPress: " + kp);
}
}
} }
} }