summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-11-19 09:49:31 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-11-19 09:49:31 +0000
commitf5bc81ba1313166f2e6a83a0cb2a15f9b302893b (patch)
treeca0207920df2395023440099263a10026f560fff /src
parent8e750ae86849ddf3e4ce866c0b440135e9b9b43f (diff)
downloadhercules-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
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c5
1 files changed, 3 insertions, 2 deletions
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);
}