- Removed the on-die specific code from unit_remove_map and placed it on the corresponding *_dead functions. unit_remove_map should never assume the char died, it is just a "remove from map" function.

- Updated status_damage to handle the general death code (clearing status changes, clearing skill related data, sending death packet, etc). The return value from the *_dead functions will tell it what to do or not with the object (death aborted, clear it from map/memory, etc)
- Cleaned up pc_dead to take advantage of the fact that status changes are not ended until after the function.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6852 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 3 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 4b61c5f74..bf0d3e2da 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3690,9 +3690,8 @@ static int atkillmonster_sub(struct block_list *bl, va_list ap) {
 	

 	if (flag)

 		status_kill(bl);

-	else

-		unit_remove_map(&md->bl,1);

-	

+	else //FIXME: Eh.. what exactly is the difference here?

+		status_kill(bl);	

 	return 1;

 }

 void atcommand_killmonster_sub(