diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-08-31 13:22:39 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-08-31 13:22:39 -0600 |
| commit | 67a8847e17aa72981bbf3b4c15167cc0ef499da1 (patch) | |
| tree | 30b07708a5893712ea1a0bb4835881caa3dd97f7 /src/map/clif.c | |
| parent | 0e36f6e8d82e7cb0f01683454790a7123ea03197 (diff) | |
| parent | dbd9d0321c66deeecf01445f8298aa5076391fbd (diff) | |
| download | tmwa-67a8847e17aa72981bbf3b4c15167cc0ef499da1.tar.gz tmwa-67a8847e17aa72981bbf3b4c15167cc0ef499da1.tar.bz2 tmwa-67a8847e17aa72981bbf3b4c15167cc0ef499da1.tar.xz tmwa-67a8847e17aa72981bbf3b4c15167cc0ef499da1.zip | |
Merge commit 'taw/master'
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 5a372e7..70311e9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3369,9 +3369,9 @@ int clif_damage(struct block_list *src,struct block_list *dst,unsigned int tick, type = 9; if(sc_data[SC_HALLUCINATION].timer != -1) { if(damage > 0) - damage = damage*(5+sc_data[SC_HALLUCINATION].val1) + rand()%100; + damage = damage*(5+sc_data[SC_HALLUCINATION].val1) + MRAND(100); if(damage2 > 0) - damage2 = damage2*(5+sc_data[SC_HALLUCINATION].val1) + rand()%100; + damage2 = damage2*(5+sc_data[SC_HALLUCINATION].val1) + MRAND(100); } } @@ -3881,7 +3881,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst, if(type != 5 && sc_data[SC_ENDURE].timer != -1) type = 9; if(sc_data[SC_HALLUCINATION].timer != -1 && damage > 0) - damage = damage*(5+sc_data[SC_HALLUCINATION].val1) + rand()%100; + damage = damage*(5+sc_data[SC_HALLUCINATION].val1) + MRAND(100); } WBUFW(buf,0)=0x1de; @@ -3921,7 +3921,7 @@ int clif_skill_damage2(struct block_list *src,struct block_list *dst, if(type != 5 && sc_data[SC_ENDURE].timer != -1) type = 9; if(sc_data[SC_HALLUCINATION].timer != -1 && damage > 0) - damage = damage*(5+sc_data[SC_HALLUCINATION].val1) + rand()%100; + damage = damage*(5+sc_data[SC_HALLUCINATION].val1) + MRAND(100); } WBUFW(buf,0)=0x115; @@ -6506,7 +6506,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c < if (tmw_CheckChatSpam(sd, RFIFOP(fd,4))) return; - if ((malformed)||(pc_isdead(sd))) { + if (malformed) { free(buf); return; } |