gg
This commit is contained in:
parent
7c526a8e11
commit
ccc6d8d93e
1 changed files with 2 additions and 4 deletions
|
@ -208,14 +208,12 @@ 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:
|
||||
|
|
Loading…
Add table
Reference in a new issue