(95bf20e92) Disable watchman and mechanic variants for the build, because they are not yet quite there.

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:17:11 +03:00
parent 5d38344efc
commit 306e3575a8
23 changed files with 452 additions and 176 deletions
@@ -71,7 +71,6 @@ namespace Barotrauma
#if DEBUG
DebugConsole.NewMessage($"Removing subobjective {subObjective.DebugTag} of {DebugTag}, because it is completed.");
#endif
subObjective.OnCompleted();
subObjectives.Remove(subObjective);
}
else if (!subObjective.CanBeCompleted)
@@ -94,9 +93,9 @@ namespace Barotrauma
bool wasCompleted = IsCompleted();
Act(deltaTime);
if (IsCompleted())
if (!wasCompleted && IsCompleted())
{
OnCompleted();
Completed?.Invoke();
}
}
@@ -214,15 +213,6 @@ namespace Barotrauma
//}
}
protected virtual void OnCompleted()
{
if (Completed != null)
{
Completed();
Completed = null;
}
}
public virtual void Reset() { }
protected abstract void Act(float deltaTime);