*Merge.

--HG--
branch : trunk

1 files changed, 15 insertions, 0 deletions

diff --git a/src/game/World.cpp b/src/game/World.cpp
index ff1e5f616a7..e0295b208e6 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -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;