summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-05 02:51:57 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-05 02:51:57 +0000
commite9c1908de22b4a194ca70e8d46daa2a95c2e2fc4 (patch)
treec25492d21bfd137f21eab51f793ee934ef54b2bc /src/map
parent22a782729ac53afe8c2641eea916d259da4ca711 (diff)
downloadhercules-e9c1908de22b4a194ca70e8d46daa2a95c2e2fc4.tar.gz
hercules-e9c1908de22b4a194ca70e8d46daa2a95c2e2fc4.tar.bz2
hercules-e9c1908de22b4a194ca70e8d46daa2a95c2e2fc4.tar.xz
hercules-e9c1908de22b4a194ca70e8d46daa2a95c2e2fc4.zip
- Fixed crash when using Adaptation during an Encore.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8627 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 8853dffbf..acbd081c4 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -9544,16 +9544,16 @@ void skill_stop_dancing (struct block_list *src)
dsd = map_id2sd(sc->data[SC_DANCING].val4);
sc->data[SC_DANCING].val4 = 0;
}
+ status_change_end(src, SC_DANCING, -1);
- if (group)
- skill_delunitgroup(NULL, group, 0);
-
if (dsd)
{
dsd->sc.data[SC_DANCING].val4 = dsd->sc.data[SC_DANCING].val2 = 0;
status_change_end(&dsd->bl, SC_DANCING, -1);
}
- status_change_end(src, SC_DANCING, -1);
+
+ if (group)
+ skill_delunitgroup(NULL, group, 0);
}
/*==========================================
@@ -9789,7 +9789,7 @@ int skill_delunitgroup (struct block_list *src, struct skill_unit_group *group,
group->valstr=NULL;
}
- map_freeblock((struct block_list*)group->unit);
+ map_freeblock(&group->unit->bl);
group->unit=NULL;
group->group_id=0;
group->unit_count=0;