FollowBot.cpp: remove duplicate code in cm

This commit is contained in:
Unnamed 2019-04-27 03:37:50 +00:00 committed by TotallyNotElite
parent fb992b7128
commit 4cbeaa6e64

View File

@ -237,7 +237,7 @@ static bool startFollow(CachedEntity *entity, bool useNavbot)
static void cm() static void cm()
{ {
if (!enable) if (!enable || CE_BAD(LOCAL_E) || !LOCAL_E->m_bAlivePlayer() || CE_BAD(LOCAL_W))
{ {
follow_target = 0; follow_target = 0;
if (nb::task::current_task == nb::task::followbot) if (nb::task::current_task == nb::task::followbot)
@ -247,14 +247,6 @@ static void cm()
if (!inited) if (!inited)
init(); init();
// We need a local player to control
if (CE_BAD(LOCAL_E) || !LOCAL_E->m_bAlivePlayer() || CE_BAD(LOCAL_W))
{
follow_target = 0;
if (nb::task::current_task == nb::task::followbot)
nb::task::current_task = nb::task::none;
return;
}
if (nb::task::current_task == nb::task::health || nb::task::current_task == nb::task::ammo) if (nb::task::current_task == nb::task::health || nb::task::current_task == nb::task::ammo)
{ {
follow_target = 0; follow_target = 0;