Browse Source

- 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.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6624 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 years ago
parent
commit
4fcac3b2f9
3 changed files with 9 additions and 6 deletions
  1. 3 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/battle.c
  3. 5 5
      src/map/clif.c

+ 3 - 0
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]

+ 1 - 1
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;
 	}
 	

+ 5 - 5
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;
 	}