This commit is contained in:
gravity 2023-08-18 00:01:16 +03:00
parent e67d56d6bf
commit 2e4a17edfa

View file

@ -14,13 +14,9 @@ using DangerousD.GameCore.Managers;
namespace DangerousD.GameCore namespace DangerousD.GameCore
{ {
public enum MultiPlayerStatus { SinglePlayer, Host, Client } public enum MultiPlayerStatus { SinglePlayer, Host, Client }
<<<<<<< HEAD public enum GameState { Menu, Options, Lobby, Game, Login, Death, HUD,
public enum GameState { Menu, Options, Lobby, Game, Login, Death, HUD }
=======
public enum GameState { Menu, Options, Lobby, Game, Login, Death,
GameOver GameOver
} }
>>>>>>> e6d0f2b8a092647a5c02741fd70194bfb376b202
public class AppManager : Game public class AppManager : Game
{ {
public static AppManager Instance { get; private set; } public static AppManager Instance { get; private set; }