diff --git a/DangerousD/Content/deathBackground.jpg b/DangerousD/Content/deathBackground.jpg index d8c4062..8e6095c 100644 Binary files a/DangerousD/Content/deathBackground.jpg and b/DangerousD/Content/deathBackground.jpg differ diff --git a/DangerousD/GameCore/GUI/LoginGUI.cs b/DangerousD/GameCore/GUI/LoginGUI.cs index 7d5ee76..f122ad4 100644 --- a/DangerousD/GameCore/GUI/LoginGUI.cs +++ b/DangerousD/GameCore/GUI/LoginGUI.cs @@ -44,6 +44,7 @@ namespace DangerousD.GameCore.GUI Button backButton = new Button(Manager) { rectangle = new Rectangle(screenWidth / 20, screenHeight / 15, (int)(40 * 2.4), (int)(40 * 2.4)), + text = "<-", fontColor = Color.Black, fontName = "font2", textureName = "textboxbackground1-1" diff --git a/DangerousD/GameCore/GUI/OptionsGUI.cs b/DangerousD/GameCore/GUI/OptionsGUI.cs index 53b1953..9ceb725 100644 --- a/DangerousD/GameCore/GUI/OptionsGUI.cs +++ b/DangerousD/GameCore/GUI/OptionsGUI.cs @@ -66,7 +66,7 @@ namespace DangerousD.GameCore.GUI Elements.Add(lblSwitchMode); Button bTExit = new Button(Manager) - { fontName = "Font2", scale = 0.72f, text = "<-", rectangle = new Rectangle(wigth / 30, height / 30, (int)(40 * 2.4), (int)(40 * 2.4)), textureName = "textboxbackground1-1" }; + { fontName = "Font2", text = "<-", rectangle = new Rectangle(wigth / 30, height / 30, (int)(40 * 2.4), (int)(40 * 2.4)), textureName = "textboxbackground1-1" }; Elements.Add(bTExit); bTExit.LeftButtonPressed += () => { diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs index 73e9662..06c6f79 100644 --- a/DangerousD/GameCore/Managers/AppManager.cs +++ b/DangerousD/GameCore/Managers/AppManager.cs @@ -208,14 +208,7 @@ namespace DangerousD.GameCore case GameState.Lobby: break; case GameState.Game: -<<<<<<< HEAD - - GameManager.mapManager.LoadLevel("map"); - - -======= GameManager.mapManager.LoadLevel(currentMap); ->>>>>>> main GameManager.FindBorders(); break; case GameState.Death: