2-24-16 build changes

Zennysoft.Game.Ma/src/map/Map.cs

@@ -46,14 +46,15 @@ public partial class Map : Node3D, IMap
     if (animName == "fade_out")
     {
       await LoadNewFloor();
+      FloorLoaded?.Invoke();
     }
   }
 
   private async Task LoadNewFloor()
   {
-    CurrentFloor?.CallDeferred(MethodName.QueueFree, []);
     SpawnPointCreated?.Invoke((Vector3.Forward, new Vector3(-999, -999, -999)));
     var newFloor = await LoadNewFloor(_sceneName);
+    ClearFloor();
     AddChild(newFloor);
     InitializeFloor(newFloor);
     var floor = MapOrder.GetChildren().OfType<FloorNode>().ElementAt(CurrentFloorNumber.Value);
@@ -82,6 +83,11 @@ public partial class Map : Node3D, IMap
     return (spawnPoint.Rotation, spawnPoint.Position);
   }
 
+  public void ClearFloor()
+  {
+    CurrentFloor?.CallDeferred(MethodName.QueueFree, []);
+  }
+
   public async Task LoadFloor()
   {
     var floor = MapOrder.GetChildren().OfType<FloorNode>().ElementAt(CurrentFloorNumber.Value + 1);
@@ -104,7 +110,6 @@ public partial class Map : Node3D, IMap
     SetupDungeonFloor();
     CurrentFloor.FloorIsLoaded = true;
     CurrentFloorNumber.OnNext(CurrentFloorNumber.Value + 1);
-    FloorLoaded?.Invoke();
   }
 
   private async Task<Node> LoadNewFloor(string sceneName)