1
0

Merge branch 'master' into potions

This commit is contained in:
madmaxoft
2014-07-17 11:01:26 +02:00
21 changed files with 62 additions and 41 deletions

View File

@@ -609,14 +609,14 @@ bool cPluginManager::CallHookHopperPushingItem(cWorld & a_World, cHopperEntity &
bool cPluginManager::CallHookKilling(cEntity & a_Victim, cEntity * a_Killer)
bool cPluginManager::CallHookKilling(cEntity & a_Victim, cEntity * a_Killer, TakeDamageInfo & a_TDI)
{
FIND_HOOK(HOOK_KILLING);
VERIFY_HOOK;
for (PluginList::iterator itr = Plugins->second.begin(); itr != Plugins->second.end(); ++itr)
{
if ((*itr)->OnKilling(a_Victim, a_Killer))
if ((*itr)->OnKilling(a_Victim, a_Killer, a_TDI))
{
return true;
}