pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 07:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed a bunch of event names, made event_death returning more seamless and fixed up trading quests to have them always face target outside the parser

Browse Source
This commit is contained in:
KimLS
2013-05-15 18:43:06 -07:00
parent b26df187e6
commit f2e0f9cca5
20 changed files with 101 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+5 -5
View File
@@ -4792,9 +4792,11 @@ Mob* Merc::GetOwnerOrSelf() {
return Result;
}
void Merc::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_skill)
bool Merc::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_skill)
{
NPC::Death(killerMob, damage, spell, attack_skill);
if(!NPC::Death(killerMob, damage, spell, attack_skill))
return false;
Save();
Mob *give_exp = hate_list.GetDamageTop(this);
@@ -4809,9 +4811,7 @@ void Merc::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_sk
if(entity_list.GetCorpseByID(GetID()))
entity_list.GetCorpseByID(GetID())->Depop();
if(Suspend())
{
}
return true;
}
Client* Merc::GetMercOwner() {