Browse Source

* Fixed wrong damage numbers being displayed when the damage source was disguised (bugreport:5093, since r14979).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14996 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 13 years ago
parent
commit
92733f48bd
2 changed files with 5 additions and 2 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 3 2
      src/map/clif.c

+ 2 - 0
Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2011/11/19
+	* Fixed wrong damage numbers being displayed when the damage source was disguised (bugreport:5093, since r14979). [Ai4rei]
 2011/11/17
 	* Added a check to WFIFOSET to detect zero-length 'sets' of packets, that could cause memory corruption (through code after WFIFOHEAD(fd,packet_len(cmd)) where the length is 0). [Ai4rei]
 2011/11/16

+ 3 - 2
src/map/clif.c

@@ -3918,11 +3918,12 @@ int clif_damage(struct block_list* src, struct block_list* dst, unsigned int tic
 		WBUFL(buf,2) = -src->id;
 		if (disguised(dst))
 			WBUFL(buf,6) = dst->id;
-		if(damage > 0) WBUFW(buf,22) = -1;
 #if PACKETVER < 20071113
+		if(damage > 0) WBUFW(buf,22) = -1;
 		if(damage2 > 0) WBUFW(buf,27) = -1;
 #else
-		if(damage2 > 0) WBUFW(buf,29) = -1;
+		if(damage > 0) WBUFL(buf,22) = -1;
+		if(damage2 > 0) WBUFL(buf,29) = -1;
 #endif
 		clif_send(buf,packet_len(cmd),src,SELF);
 	}