summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-06-16 14:53:26 +0000
committerFate <fate-tmw@googlemail.com>2009-06-16 14:53:26 +0000
commit2d90300fc3c8be2319b53cae667d97547bb52fd9 (patch)
treeb92aa3fdc83be7a5cfced9f5749255afca148787 /src/map/skill.c
parent121897bca888944998c1260184a5ab4bdf4ccdad (diff)
downloadtmwa-2d90300fc3c8be2319b53cae667d97547bb52fd9.tar.gz
tmwa-2d90300fc3c8be2319b53cae667d97547bb52fd9.tar.bz2
tmwa-2d90300fc3c8be2319b53cae667d97547bb52fd9.tar.xz
tmwa-2d90300fc3c8be2319b53cae667d97547bb52fd9.zip
use pc_heal() instead of hacked-up code to report mob special skill damage, hopefully fixing 0.0.28 bugs with double death reports
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index c179f70..ea7beb3 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6333,14 +6333,16 @@ int skill_check_condition(struct map_session_data *sd,int type)
if(type&2)
return 1;
- if(sp > 0) { // SP消費
- sd->status.sp-=sp;
- clif_updatestatus(sd,SP_SP);
- }
- if(hp > 0) { // HP消費
- sd->status.hp-=hp;
- clif_updatestatus(sd,SP_HP);
- }
+ pc_heal(sd, -sp, -hp); // [Fate] This might suppress some dupe messages
+
+/* if(sp > 0) { // SP消費 */
+/* sd->status.sp-=sp; */
+/* clif_updatestatus(sd,SP_SP); */
+/* } */
+/* if(hp > 0) { // HP消費 */
+/* sd->status.hp-=hp; */
+/* clif_updatestatus(sd,SP_HP); */
+/* } */
if(zeny > 0) // Zeny消費
pc_payzeny(sd,zeny);
if(spiritball > 0) // 氣球消費