diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-15 05:30:25 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-15 05:30:25 +0000 |
| commit | a7c1a55bb6f3c3236ba02722e948a52c645a4918 (patch) | |
| tree | 15c41cc68bb37051f7fb94bac03055875e25fe5d /src/map/unit.c | |
| parent | ec4acd7b1d7f180af5929239ef0706d98d4b6bfc (diff) | |
| download | hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.gz hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.bz2 hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.xz hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.zip | |
* Merged changes from trunk [14784:14819/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14821 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index da1ce1c14..3cec43f70 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -17,6 +17,7 @@ #include "mercenary.h" #include "skill.h" #include "clif.h" +#include "duel.h" #include "npc.h" #include "guild.h" #include "status.h" @@ -2067,7 +2068,7 @@ int unit_free(struct block_list *bl, clr_type clrtype) guild_send_memberinfoshort(sd,0); pc_cleareventtimer(sd); pc_inventory_rental_clear(sd); - if( sd->state.bg_id ) bg_team_leave(sd,1); + if( sd->bg_id ) bg_team_leave(sd,1); pc_delspiritball(sd,sd->spiritball,1); if( sd->reg ) |