pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #50 from j883376/master

Browse Source 
Fix Auto XTargets not clearing on death
This commit is contained in:
Alex 2013-05-05 23:42:14 -07:00
commit 90c7fab452
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zone/attack.cpp
View File

@ -1486,6 +1486,7 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_
entity_list.RemoveFromTargets(this); entity_list.RemoveFromTargets(this);
hate_list.RemoveEnt(this); hate_list.RemoveEnt(this);
RemoveAutoXTargets();
//remove ourself from all proximities //remove ourself from all proximities

16
zone/client.cpp
View File

@ -6990,6 +6990,22 @@ void Client::RemoveGroupXTargets()
} }
} }
void Client::RemoveAutoXTargets()
{
if(!XTargettingAvailable())
return;
for(int i = 0; i < GetMaxXTargets(); ++i)
{
if(XTargets[i].Type == Auto)
{
XTargets[i].ID = 0;
XTargets[i].Name[0] = 0;
SendXTargetPacket(i, nullptr);
}
}
}
void Client::ShowXTargets(Client *c) void Client::ShowXTargets(Client *c)
{ {
if(!c) if(!c)

1
zone/client.h
View File

@ -1095,6 +1095,7 @@ public:
void RemoveXTarget(Mob *m, bool OnlyAutoSlots); void RemoveXTarget(Mob *m, bool OnlyAutoSlots);
void SendXTargetPacket(uint32 Slot, Mob *m); void SendXTargetPacket(uint32 Slot, Mob *m);
void RemoveGroupXTargets(); void RemoveGroupXTargets();
void RemoveAutoXTargets();
void ShowXTargets(Client *c); void ShowXTargets(Client *c);
void InitializeMercInfo(); void InitializeMercInfo();
bool CheckCanHireMerc(Mob* merchant, uint32 template_id); bool CheckCanHireMerc(Mob* merchant, uint32 template_id);