(6c0663ce1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:55:26 +03:00
parent 106c61ca9a
commit 5435adc9b4
16 changed files with 218 additions and 112 deletions
@@ -28,11 +28,6 @@ namespace Barotrauma
public bool IsCurrentObjective<T>() where T : AIObjective => CurrentObjective is T;
public AIObjective CurrentOrder { get; private set; }
public AIObjective CurrentObjective { get; private set; }
public bool IsCurrentObjective<T>() where T : AIObjective => CurrentObjective is T;
public AIObjectiveManager(Character character)
{
this.character = character;