Launcher error messageboxes, more easily controllable & better looking swimming, oxygen tank bugfixes, loading screen coroutine bugfix

Subsurface/Source/Screens/EditMapScreen.cs

@@ -250,7 +250,7 @@ namespace Subsurface
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
         public override void Draw(double deltaTime, GraphicsDevice graphics, SpriteBatch spriteBatch)
         {
-            //cam.UpdateTransform();
+            cam.UpdateTransform();
 
             spriteBatch.Begin(SpriteSortMode.BackToFront,
                 BlendState.AlphaBlend,

Subsurface/Source/Screens/GameScreen.cs

@@ -83,6 +83,7 @@ namespace Subsurface
             StatusEffect.UpdateAll((float)deltaTime);
 
             Physics.accumulator = Math.Min(Physics.accumulator, Physics.step * 4);
+            //Physics.accumulator = Physics.step;
             while (Physics.accumulator >= Physics.step)
             {
                 cam.MoveCamera((float)Physics.step);
@@ -119,6 +120,8 @@ namespace Subsurface
         {
             //if (!Physics.updated) return;
 
+            cam.UpdateTransform();
+
             DrawMap(graphics, spriteBatch);
 
             spriteBatch.Begin();
@@ -282,12 +285,12 @@ namespace Subsurface
             Submarine.DrawFront(spriteBatch);
 
             foreach (Character c in Character.CharacterList) c.DrawFront(spriteBatch);
-            
-            //if (GameMain.GameSession != null && GameMain.GameSession.Level != null)
-            //{
-            //    GameMain.GameSession.Level.Draw(spriteBatch);
-            //    //Game1.GameSession.Level.SetObserverPosition(cam.WorldViewCenter);
-            //}
+
+            if (GameMain.GameSession != null && GameMain.GameSession.Level != null)
+            {
+                GameMain.GameSession.Level.Draw(spriteBatch);
+                //Game1.GameSession.Level.SetObserverPosition(cam.WorldViewCenter);
+            }
 
             spriteBatch.End();
 

Subsurface/Source/Screens/LobbyScreen.cs

@@ -446,14 +446,15 @@ namespace Subsurface
 
         private bool StartShift(GUIButton button, object selection)
         {
-            GameMain.ShowLoading(ShiftLoading());
+            //GameMain.ShowLoading(ShiftLoading());
+            GameMain.GameSession.StartShift(TimeSpan.Zero, selectedLevel, false);
+            GameMain.GameScreen.Select();
             
             return true;
         }
 
         private IEnumerable<object> ShiftLoading()
-        {          
-            
+        {
             GameMain.GameSession.StartShift(TimeSpan.Zero, selectedLevel, false);
             GameMain.GameScreen.Select();
 

Subsurface/Source/Screens/MainMenuScreen.cs

@@ -158,6 +158,8 @@ namespace Subsurface
         {
             base.Select();
 
+            Submarine.Unload();
+
             SelectTab(null, 0);
             //selectedTab = 0;
         }

Subsurface/Source/Screens/NetLobbyScreen.cs

@@ -546,11 +546,8 @@ namespace Subsurface
         {
             Gender gender = (Gender)obj;
             GameMain.NetworkMember.CharacterInfo.Gender = gender;
-            GameMain.Client.SendCharacterData();
+            if (GameMain.Client != null) GameMain.Client.SendCharacterData();
                 
-            //CreatePreviewCharacter();
-           
-            
             UpdatePreviewPlayer(GameMain.NetworkMember.CharacterInfo);
             return true;
         }