(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
@@ -149,7 +149,6 @@ namespace Barotrauma
                            character.MemLocalState[i].TransformOutToInside(currentHull.Submarine);
                        }
                    }
-
                }

                if (character.MemState.Count < 1) return;
@@ -164,14 +164,8 @@ namespace Barotrauma
                        break;
                }
            }
-        }

-        partial void UpdateLimbLightSource(Limb limb)
-        {
-            if (limb.LightSource != null)
-            {
-                limb.LightSource.Enabled = enabled;
-            }
+            hudProgressBars = new Dictionary<object, HUDProgressBar>();
        }

        partial void UpdateLimbLightSource(Limb limb)
@@ -174,13 +174,6 @@ namespace Barotrauma
            {
                DrawObjectiveIndicator(spriteBatch, cam, character, objectiveEntity, 1.0f);
            }
-        }
-        
-        public static void Draw(SpriteBatch spriteBatch, Character character, Camera cam)
-        {
-            if (GUI.DisableHUD) return;
-            
-            character.CharacterHealth.Alignment = Alignment.Right;

            foreach (Item brokenItem in brokenItems)
            {
@@ -292,7 +292,6 @@ namespace Barotrauma
                    if (!string.IsNullOrWhiteSpace(damageModifier.DamageSound))
                    {
                        damageSoundType = damageModifier.DamageSound;
-                        SoundPlayer.PlayDamageSound(damageSoundType, Math.Max(damage, bleedingDamage), WorldPosition);
                        break;
                    }
                }