v0.14.6.0

2021-06-17 17:54:52 +03:00
parent 3f324b14e8
commit c27e2ea5ab
348 changed files with 13156 additions and 4266 deletions
@@ -106,6 +106,7 @@ namespace Barotrauma
        class CharacterSpawnInfo : IEntitySpawnInfo
        {
            public readonly string identifier;
+            public readonly CharacterInfo CharacterInfo;

            public readonly Vector2 Position;
            public readonly Submarine Submarine;
@@ -127,13 +128,17 @@ namespace Barotrauma
                this.onSpawned = onSpawn;
            }

+            public CharacterSpawnInfo(string identifier, Vector2 position, CharacterInfo characterInfo, Action<Character> onSpawn = null) : this (identifier, position, onSpawn)
+            {
+                CharacterInfo = characterInfo;
+            }

            public Entity Spawn()
            {
                var character = string.IsNullOrEmpty(identifier) ? null :
                    Character.Create(identifier,
                    Submarine == null ? Position : Submarine.Position + Position,
-                    ToolBox.RandomSeed(8), createNetworkEvent: false);
+                    ToolBox.RandomSeed(8), CharacterInfo, createNetworkEvent: false);
                return character;
            }

@@ -302,6 +307,19 @@ namespace Barotrauma
            spawnQueue.Enqueue(new CharacterSpawnInfo(speciesName, position, sub, onSpawn));
        }

+        public void AddToSpawnQueue(string speciesName, Vector2 worldPosition, CharacterInfo characterInfo, Action<Character> onSpawn = null)
+        {
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }
+            if (string.IsNullOrEmpty(speciesName))
+            {
+                string errorMsg = "Attempted to add an empty/null species name to entity spawn queue.\n" + Environment.StackTrace.CleanupStackTrace();
+                DebugConsole.ThrowError(errorMsg);
+                GameAnalyticsManager.AddErrorEventOnce("EntitySpawner.AddToSpawnQueue4:SpeciesNameNullOrEmpty", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                return;
+            }
+            spawnQueue.Enqueue(new CharacterSpawnInfo(speciesName, worldPosition, characterInfo, onSpawn));
+        }
+
        public void AddToRemoveQueue(Entity entity)
        {
            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }