pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-29 16:58:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
KimLS
2013-06-05 16:58:11 -07:00
parent a3738dc131 29c0c4801c
commit cec60feba9
15 changed files with 299 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/npc.h
+1 -1
View File
@@ -352,7 +352,7 @@ public:
uint32 GetSpawnKillCount();
int GetScore();
void mod_prespawn(Spawn2 *sp);
int mod_npc_damage(int damage, SkillType skillinuse, int hand, ItemInst* weapon, Mob* other);
int mod_npc_damage(int damage, SkillType skillinuse, int hand, const Item_Struct* weapon, Mob* other);
void mod_npc_killed_merit(Mob* c);
void mod_npc_killed(Mob* oos);