summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c9
2 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0e561cee9..209bb4451 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/22
+ * Fixed AM_REST not closing the homunc status window [Toms]
* Fixed SC_NEN according to Mpeg [Toms]
* Added a ShowStatus("Terminating...\n") on login-server_sql [Toms]
* Some corrections to make Tatami Gaeshi work correctly. [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c
index bfc4c15fb..96fa3451e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5473,9 +5473,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
}
break;
- case AM_REST: //[orn]
- if (sd && !merc_hom_vaporize(sd,1))
- clif_skill_fail(sd,skillid,0,0);
+ case AM_REST:
+ if (sd)
+ if (merc_hom_vaporize(sd,1))
+ clif_skill_nodamage(src, bl, skillid, skilllv, 1);
+ else
+ clif_skill_fail(sd,skillid,0,0);
break;
case HAMI_CASTLE: //[orn]