*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
635faad2bc
7 files changed
+28
-9
No files matched your search
@@ -2501,6 +2501,21 @@ void World::ScriptsProcess()
|
||||
break;
|
||||
}
|
||||
|
||||
case SCRIPT_COMMAND_KILL:
|
||||
{
|
||||
if(!source || ((Creature*)source)->isDead())
|
||||
break;
|
||||
|
||||
((Creature*)source)->DealDamage(((Creature*)source), ((Creature*)source)->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
|
||||
|
||||
switch(step.script->dataint)
|
||||
{
|
||||
case 0: break; //return false not remove corpse
|
||||
case 1: ((Creature*)source)->RemoveCorpse(); break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
sLog.outError("Unknown script command %u called.",step.script->command);
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user