Missing p_item, s_item in CombatRangeInput

This commit is contained in:
nytmyr
2025-01-24 12:45:20 -06:00
parent cec1dbda94
commit f8ff6794c1
2 changed files with 16 additions and 15 deletions
+6 -5
View File
@@ -2291,12 +2291,17 @@ void Bot::AI_Process()
bool behind_mob = BehindMob(tar, GetX(), GetY()); bool behind_mob = BehindMob(tar, GetX(), GetY());
uint8 stop_melee_level = GetStopMeleeLevel(); uint8 stop_melee_level = GetStopMeleeLevel();
tar_distance = sqrt(tar_distance); // sqrt this for future calculations tar_distance = sqrt(tar_distance); // sqrt this for future calculations
// Item variables
const EQ::ItemInstance* p_item = GetBotItem(EQ::invslot::slotPrimary);
const EQ::ItemInstance* s_item = GetBotItem(EQ::invslot::slotSecondary);
CombatRangeInput input = { CombatRangeInput input = {
.target = tar, .target = tar,
.target_distance = tar_distance, .target_distance = tar_distance,
.behind_mob = behind_mob, .behind_mob = behind_mob,
.stop_melee_level = stop_melee_level .stop_melee_level = stop_melee_level,
.p_item = p_item,
.s_item = s_item
}; };
CombatRangeOutput o = EvaluateCombatRange(input); CombatRangeOutput o = EvaluateCombatRange(input);
@@ -2307,10 +2312,6 @@ void Bot::AI_Process()
float melee_distance = o.melee_distance; float melee_distance = o.melee_distance;
float melee_distance_max = o.melee_distance_max; float melee_distance_max = o.melee_distance_max;
// Item variables
const EQ::ItemInstance* p_item = GetBotItem(EQ::invslot::slotPrimary);
const EQ::ItemInstance* s_item = GetBotItem(EQ::invslot::slotSecondary);
// PULLING FLAG (ACTIONABLE RANGE) // PULLING FLAG (ACTIONABLE RANGE)
if (GetPullingFlag()) { if (GetPullingFlag()) {