summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/clif.c10
3 files changed, 9 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a76d9bfb3..030273e83 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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/05/16
+ * Modified "hide woe damage" to send the number of hits rather than 1 as
+ damage Because when the damage is less than the number of hits, the client
+ will display MISS. [Skotlex]
* Fire Pillar will now do 200%MATK damage per hit when level is >10.
[Skotlex]
* Blood Drain always hits now. [Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c
index 39ded0982..c155aed11 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -251,7 +251,7 @@ int battle_damage(struct block_list *src,struct block_list *target,int damage, i
r_damage = pc_damage(src,(TBL_PC*)target,damage);
break;
case BL_SKILL:
- r_damage = skill_unit_ondamaged((struct skill_unit *)target, src, damage, gettick());
+ r_damage = skill_unit_ondamaged((struct skill_unit *)target, src, damage, gettick());
break;
}
diff --git a/src/map/clif.c b/src/map/clif.c
index 17da41933..340a666d3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3870,8 +3870,8 @@ int clif_damage(struct block_list *src,struct block_list *dst,unsigned int tick,
WBUFL(buf,14)=sdelay;
WBUFL(buf,18)=ddelay;
if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
- WBUFW(buf,22)=1;
- WBUFW(buf,27)=1;
+ WBUFW(buf,22)=div;
+ WBUFW(buf,27)=damage2?div:0;
} else {
WBUFW(buf,22)=(damage > SHRT_MAX)?SHRT_MAX:damage;
WBUFW(buf,27)=damage2;
@@ -4390,7 +4390,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,
WBUFL(buf,16)=sdelay;
WBUFL(buf,20)=ddelay;
if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
- WBUFW(buf,24)=1;
+ WBUFW(buf,24)=div;
} else {
WBUFW(buf,24)=damage;
}
@@ -4421,7 +4421,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst,
WBUFL(buf,16)=sdelay;
WBUFL(buf,20)=ddelay;
if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
- WBUFL(buf,24)=1;
+ WBUFL(buf,24)=div;
} else {
WBUFL(buf,24)=damage;
}
@@ -4481,7 +4481,7 @@ int clif_skill_damage2(struct block_list *src,struct block_list *dst,
WBUFW(buf,24)=dst->x;
WBUFW(buf,26)=dst->y;
if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
- WBUFW(buf,28)=1;
+ WBUFW(buf,28)=div;
} else {
WBUFW(buf,28)=damage;
}