summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-11-08 14:32:36 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-11-08 14:32:36 +0000
commitcc43f617d80d71dda41d0d7b8ea4ad92fdd2f09e (patch)
tree0a92e04a46db7fb906b4ae1cd9e72c2fdb8d1105 /src/map
parentb802fba7c0d6d043dfbb06e565ffe94ad3643bfa (diff)
downloadhercules-cc43f617d80d71dda41d0d7b8ea4ad92fdd2f09e.tar.gz
hercules-cc43f617d80d71dda41d0d7b8ea4ad92fdd2f09e.tar.bz2
hercules-cc43f617d80d71dda41d0d7b8ea4ad92fdd2f09e.tar.xz
hercules-cc43f617d80d71dda41d0d7b8ea4ad92fdd2f09e.zip
Fixed the flag from my last commit not working
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14137 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mob.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index b2f6ce4ff..3ab50da79 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1954,7 +1954,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
int i,temp,count,pnum=0,m=md->bl.m;
unsigned int mvp_damage, tick = gettick();
unsigned short flaghom = 1; // [Zephyrus] Does the mob only received damage from homunculus?
- bool rebirth = ( md->sc.data[SC_KAIZEL] || (md->sc.data[SC_REBIRTH] && !md->state.rebirth) );
+ bool rebirth;
status = &md->status;
@@ -2371,6 +2371,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
//Emperium destroyed by script. Discard mvp character. [Skotlex]
mvp_sd = NULL;
+ rebirth = ( md->sc.data[SC_KAIZEL] || (md->sc.data[SC_REBIRTH] && !md->state.rebirth) );
if( !rebirth )
{ // Only trigger event on final kill
md->status.hp = 0; //So that npc_event invoked functions KNOW that mob is dead