(9a7d83a40) Fullscreen bug workarounds

Barotrauma/BarotraumaShared/Source/Characters/Animation/Params/Ragdoll/RagdollParams.cs

@@ -36,8 +36,7 @@ namespace Barotrauma
         [Serialize(1.0f, true), Editable(MIN_SCALE, MAX_SCALE, DecimalCount = 3)]
         public float JointScale { get; set; }
 
-        // Don't show in the editor, because shouldn't be edited in runtime.  Requires that the limb scale and the collider sizes are adjusted. TODO: automatize.
-        [Serialize(1f, false)]
+        [Serialize(1f, true), Editable(DecimalCount = 2)]
         public float TextureScale { get; set; }
 
         [Serialize(45f, true), Editable(0f, 1000f)]

Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs

@@ -17,12 +17,6 @@ namespace Barotrauma
     {
         public abstract RagdollParams RagdollParams { get; protected set; }
 
-        const float ImpactDamageMultiplayer = 10.0f;
-        /// <summary>
-        /// Maximum damage per impact (0.1 = 10% of the character's maximum health)
-        /// </summary>
-        const float MaxImpactDamage = 0.1f;
-
         private static List<Ragdoll> list = new List<Ragdoll>();
 
         protected Hull currentHull;
@@ -694,10 +688,8 @@ namespace Barotrauma
                         Vector2 impactPos = ConvertUnits.ToDisplayUnits(points[0]);
                         if (character.Submarine != null) impactPos += character.Submarine.Position;
 
-                        float impactDamage = Math.Min((impact - ImpactTolerance) * ImpactDamageMultiplayer, character.MaxVitality * MaxImpactDamage);
-
                         character.LastDamageSource = null;
-                        character.AddDamage(impactPos, new List<Affliction>() { AfflictionPrefab.InternalDamage.Instantiate(impactDamage) }, 0.0f, true);
+                        character.AddDamage(impactPos, new List<Affliction>() { AfflictionPrefab.InternalDamage.Instantiate((impact - ImpactTolerance) * 10.0f) }, 0.0f, true);
                         strongestImpact = Math.Max(strongestImpact, impact - ImpactTolerance);
                         character.ApplyStatusEffects(ActionType.OnImpact, 1.0f);
                         //briefly disable impact damage
@@ -1311,6 +1303,13 @@ namespace Barotrauma
                         }
                     }
                 }
+                foreach (Limb limb in Limbs)
+                {
+                    limb.body.SetTransform(Collider.SimPosition, 0.0f);
+                    limb.body.ResetDynamics();
+                }
+                SetInitialLimbPositions();
+                return false;
             }
             UpdateProjSpecific(deltaTime);
         }