This commit is contained in:
Ivan Filipenkov 2023-08-18 19:59:32 +03:00
parent 69f96286ef
commit 87c3a168af

View file

@ -208,14 +208,7 @@ namespace DangerousD.GameCore
case GameState.Lobby: case GameState.Lobby:
break; break;
case GameState.Game: case GameState.Game:
<<<<<<< HEAD
GameManager.mapManager.LoadLevel("map");
=======
GameManager.mapManager.LoadLevel(currentMap); GameManager.mapManager.LoadLevel(currentMap);
>>>>>>> main
GameManager.FindBorders(); GameManager.FindBorders();
break; break;
case GameState.Death: case GameState.Death: