Voting for round to end, level generation improvements

2016-02-12 19:39:24 +02:00
parent 3ffc19485b
commit c6f52cc68f
20 changed files with 294 additions and 129 deletions
@@ -915,7 +915,7 @@ namespace Barotrauma

            if (isDead) return;

-            if (!(AnimController is FishAnimController))
+            if (needsAir)
            {
                bool protectedFromPressure = PressureProtection > 0.0f;

@@ -1445,7 +1445,7 @@ namespace Barotrauma
                    else
                    {
                        Character character = FindEntityByID(characterId) as Character;
-                        if (character != null) SelectCharacter(character, false);
+                        if (character != null && character.IsHumanoid) SelectCharacter(character, false);
                    }
                    return;
                case NetworkEventType.KillCharacter: