Functional level generation + moving the submarine

2015-06-26 23:05:51 +03:00
parent bda9b31cbe
commit 9237a9efe2
48 changed files with 1629 additions and 750 deletions
--- a/Subsurface/Networking/GameClient.cs
+++ b/Subsurface/Networking/GameClient.cs
@@ -240,7 +240,7 @@ namespace Subsurface.Networking
                        TimeSpan duration = new TimeSpan(0,(int)durationMinutes,0);

                        //int gameModeIndex = inc.ReadInt32();
-                        Game1.GameSession = new GameSession(Map.Loaded);
+                        Game1.GameSession = new GameSession(Submarine.Loaded);
                        Game1.GameSession.StartShift(duration, 1);

                        myCharacter = ReadCharacterData(inc);
@@ -323,7 +323,7 @@ namespace Subsurface.Networking

        public void EndGame(string endMessage)
        {
-            Map.Unload();
+            Submarine.Unload();

            Game1.NetLobbyScreen.Select();