(3e8bdbb0a) v0.8.9.9 + merge fix

This commit is contained in:
Joonas Rikkonen
2019-04-06 17:52:51 +03:00
parent f043ac26f4
commit d15a88c619
9 changed files with 12 additions and 108 deletions
@@ -136,21 +136,6 @@ namespace Barotrauma
}
}
}
// When defensive, try to retreat to safety. TODO: in offsensive mode, engage the target
Retreat(deltaTime);
break;
case CombatMode.Retreat:
Retreat(deltaTime);
break;
case CombatMode.Offensive:
default:
throw new System.NotImplementedException();
}
else if (Equip(deltaTime))
{
if (Reload(deltaTime))
{
Attack(deltaTime);
}
}
return weapon;