Skip to content

Commit

Permalink
Fix merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
killerwife committed Nov 13, 2024
1 parent d42876f commit 2076056
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/game/Entities/Creature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2152,7 +2152,7 @@ bool Creature::IsVisibleInGridForPlayer(Player* pl) const
return false;
}

void Creature::CallAssistance(Unit* enemy)
void Creature::CallAssistance()
{
CallAssistance(GetVictim());
}
Expand Down Expand Up @@ -2189,11 +2189,6 @@ void Creature::CallForHelp(float radius)
Cell::VisitGridObjects(this, worker, radius);
}

void Creature::CallAssistance()
{
CallAssistance(GetVictim());
}

/// if enemy provided, check for initial combat help against enemy
bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /*= true*/) const
{
Expand Down

0 comments on commit 2076056

Please sign in to comment.