pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 07:21:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix for bots compile

Browse Source
This commit is contained in:
KimLS 2015-01-23 18:24:53 -08:00
parent a7710c027b
commit 669bca8da8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zone/bot.cpp
View File

@ -9074,7 +9074,7 @@ void Bot::DoBuffTic(uint16 spell_id, int slot, uint32 ticsremaining, uint8 caste
bool Bot::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, int16 *resist_adjust) { bool Bot::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, int16 *resist_adjust) {
bool Result = false; bool Result = false;
if(zone && !zone->IsSpellBlocked(spell_id, GetPosition())) { if(zone && !zone->IsSpellBlocked(spell_id, glm::vec3(GetPosition()))) {
Log.Out(Logs::Detail, Logs::Spells, "CastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item slot %d", Log.Out(Logs::Detail, Logs::Spells, "CastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item slot %d",
spells[spell_id].name, spell_id, target_id, slot, cast_time, mana_cost, (item_slot==0xFFFFFFFF)?999:item_slot); spells[spell_id].name, spell_id, target_id, slot, cast_time, mana_cost, (item_slot==0xFFFFFFFF)?999:item_slot);
@ -10661,12 +10661,12 @@ void Bot::BotGroupSummon(Group* group, Client* client) {
if(botMember->GetBotOwnerCharacterID() == client->CharacterID()) { if(botMember->GetBotOwnerCharacterID() == client->CharacterID()) {
botMember->SetTarget(botMember->GetBotOwner()); botMember->SetTarget(botMember->GetBotOwner());
botMember->WipeHateList(); botMember->WipeHateList();
botMember->Warp(botMember->GetBotOwner()->GetPosition()); botMember->Warp(glm::vec3(botMember->GetBotOwner()->GetPosition()));
if(botMember->HasPet() && botMember->GetPet()) { if(botMember->HasPet() && botMember->GetPet()) {
botMember->GetPet()->SetTarget(botMember); botMember->GetPet()->SetTarget(botMember);
botMember->GetPet()->WipeHateList(); botMember->GetPet()->WipeHateList();
botMember->GetPet()->Warp(botMember->GetBotOwner()->GetPosition()); botMember->GetPet()->Warp(glm::vec3(botMember->GetBotOwner()->GetPosition()));
} }
} }
} }
@ -11675,7 +11675,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
else else
{ {
b->SetTarget(c->CastToMob()); b->SetTarget(c->CastToMob());
b->Warp(c->GetPosition()); b->Warp(glm::vec3(c->GetPosition()));
} }
} }
} }
@ -15745,7 +15745,6 @@ void EntityList::BotPickLock(Bot* rogue)
continue; continue;
auto diff = rogue->GetPosition() - cdoor->GetPosition(); auto diff = rogue->GetPosition() - cdoor->GetPosition();
diff.ABS_XYZ();
float curdist = diff.x * diff.x + diff.y * diff.y; float curdist = diff.x * diff.x + diff.y * diff.y;

2
zone/mob.cpp
View File

@ -2414,7 +2414,7 @@ bool Mob::HateSummon() {
if(target && target->IsBot()) { if(target && target->IsBot()) {
// set pre summoning info to return to (to get out of melee range for caster) // set pre summoning info to return to (to get out of melee range for caster)
target->CastToBot()->SetHasBeenSummoned(true); target->CastToBot()->SetHasBeenSummoned(true);
target->CastToBot()->SetPreSummonLocation(target->GetPosition()); target->CastToBot()->SetPreSummonLocation(glm::vec3(target->GetPosition()));
} }
#endif //BOTS #endif //BOTS