veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-02-20 18:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix GetTargetIcons calls (thanks xuanfeng66)"

Browse Source 
This reverts commit 4abe553f2743f43e774a4c8f322398195afc7a32.
This commit is contained in:
郑佩茹 2023-03-28 13:00:57 -06:00
parent 4abe553f27
commit 47b13bf73a
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChatFilter.cpp
View File

@ -163,7 +163,7 @@ class RtiChatFilter : public ChatFilter
if (!isRti) if (!isRti)
continue; continue;
ObjectGuid rtiTarget = group->GetTargetIcons()[RtiTargetValue::GetRtiIndex(rti.substr(1))]; ObjectGuid rtiTarget = group->GetTargetIcon(RtiTargetValue::GetRtiIndex(rti.substr(1)));
if (bot->GetGUID() == rtiTarget) if (bot->GetGUID() == rtiTarget)
return ChatFilter::Filter(message); return ChatFilter::Filter(message);

2
src/strategy/actions/RtiAction.cpp
View File

@ -75,7 +75,7 @@ bool MarkRtiAction::Execute(Event event)
bool marked = false; bool marked = false;
for (uint8 i = 0; i < 8; i++) for (uint8 i = 0; i < 8; i++)
{ {
ObjectGuid iconGUID = group->GetTargetIcons()[i]; ObjectGuid iconGUID = group->GetTargetIcon(i);
if (guid == unit->GetGUID()) if (guid == unit->GetGUID())
{ {
marked = true; marked = true;

2
src/strategy/values/AttackersValue.cpp
View File

@ -101,7 +101,7 @@ bool AttackersValue::IsPossibleTarget(Unit* attacker, Player* bot, float range)
Creature* c = attacker->ToCreature(); Creature* c = attacker->ToCreature();
bool rti = false; bool rti = false;
if (attacker && bot->GetGroup()) if (attacker && bot->GetGroup())
rti = bot->GetGroup()->GetTargetIcons()[7] == attacker->GetGUID(); rti = bot->GetGroup()->GetTargetIcon(7) == attacker->GetGUID();
PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot); PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);

4
src/strategy/values/DpsTargetValue.cpp
View File

@ -14,7 +14,7 @@ class FindLeastHpTargetStrategy : public FindTargetStrategy
{ {
if (Group* group = botAI->GetBot()->GetGroup()) if (Group* group = botAI->GetBot()->GetGroup())
{ {
ObjectGuid guid = group->GetTargetIcons()[4]; ObjectGuid guid = group->GetTargetIcon(4);
if (guid && attacker->GetGUID() == guid) if (guid && attacker->GetGUID() == guid)
return; return;
} }
@ -46,7 +46,7 @@ class FindMaxHpTargetStrategy : public FindTargetStrategy
{ {
if (Group* group = botAI->GetBot()->GetGroup()) if (Group* group = botAI->GetBot()->GetGroup())
{ {
ObjectGuid guid = group->GetTargetIcons()[4]; ObjectGuid guid = group->GetTargetIcon(4);
if (guid && attacker->GetGUID() == guid) if (guid && attacker->GetGUID() == guid)
return; return;
} }

2
src/strategy/values/RtiTargetValue.cpp
View File

@ -41,7 +41,7 @@ Unit* RtiTargetValue::Calculate()
if (index == -1) if (index == -1)
return nullptr; return nullptr;
ObjectGuid guid = group->GetTargetIcons()[index]; ObjectGuid guid = group->GetTargetIcon(index);
if (!guid) if (!guid)
return nullptr; return nullptr;

4
src/strategy/values/TargetValue.cpp
View File

@ -49,14 +49,14 @@ bool FindNonCcTargetStrategy::IsCcTarget(Unit* attacker)
int32 index = RtiTargetValue::GetRtiIndex(rti); int32 index = RtiTargetValue::GetRtiIndex(rti);
if (index != -1) if (index != -1)
{ {
if (ObjectGuid guid = group->GetTargetIcons()[index]) if (ObjectGuid guid = group->GetTargetIcon(index))
if (attacker->GetGUID() == guid) if (attacker->GetGUID() == guid)
return true; return true;
} }
} }
} }
if (ObjectGuid guid = group->GetTargetIcons()[4]) if (ObjectGuid guid = group->GetTargetIcon(4))
if (attacker->GetGUID() == guid) if (attacker->GetGUID() == guid)
return true; return true;
} }