diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-11-19 09:49:31 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-11-19 09:49:31 +0000 |
| commit | f5bc81ba1313166f2e6a83a0cb2a15f9b302893b (patch) | |
| tree | ca0207920df2395023440099263a10026f560fff | |
| parent | 8e750ae86849ddf3e4ce866c0b440135e9b9b43f (diff) | |
| download | hercules-f5bc81ba1313166f2e6a83a0cb2a15f9b302893b.tar.gz hercules-f5bc81ba1313166f2e6a83a0cb2a15f9b302893b.tar.bz2 hercules-f5bc81ba1313166f2e6a83a0cb2a15f9b302893b.tar.xz hercules-f5bc81ba1313166f2e6a83a0cb2a15f9b302893b.zip | |
* Fixed wrong damage numbers being displayed when the damage source was disguised (bugreport:5093, since r14979).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14996 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 737b65acd..04715b6b6 100644 --- a/Changelog-Trunk.txt +++ b/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 diff --git a/src/map/clif.c b/src/map/clif.c index 01de1e51d..027d589bb 100644 --- a/src/map/clif.c +++ b/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); } |