Fixed endless messagebox spam when the controlled character turns into a husk, fixed an index our of range exception when merging firesources

This commit is contained in:
Joonas Rikkonen
2017-07-09 16:17:44 +03:00
parent 2598bb1bd3
commit bd4c7d68d0
3 changed files with 5 additions and 7 deletions
@@ -44,6 +44,7 @@ namespace Barotrauma
{
float prevTimer = IncubationTimer;
UpdateProjSpecific(prevTimer,character);
if (IncubationTimer < 0.5f)
{
UpdateDormantState(deltaTime, character);
@@ -56,7 +57,6 @@ namespace Barotrauma
{
UpdateActiveState(deltaTime, character);
}
UpdateProjSpecific(prevTimer,character);
}
partial void UpdateProjSpecific(float prevTimer, Character character);
@@ -86,7 +86,7 @@ namespace Barotrauma
state = InfectionState.Active;
}
character.AddDamage(CauseOfDeath.Husk, 0.5f*deltaTime, null);
character.AddDamage(CauseOfDeath.Husk, 0.5f * deltaTime, null);
}