summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-20 21:14:33 -0200
committershennetsind <ind@henn.et>2013-10-20 21:14:33 -0200
commit073023b06ca755644667bb57a34d8d05fba37b57 (patch)
tree9e22156abcca2fb55c50691d2a3774b6eb763998 /src/map/clif.c
parentd02f9afab959909398e8ebff6ab50186084c68c5 (diff)
downloadhercules-073023b06ca755644667bb57a34d8d05fba37b57.tar.gz
hercules-073023b06ca755644667bb57a34d8d05fba37b57.tar.bz2
hercules-073023b06ca755644667bb57a34d8d05fba37b57.tar.xz
hercules-073023b06ca755644667bb57a34d8d05fba37b57.zip
Bug:7723 and Skill Cooldowns
Fixed 7723, skill cooldowns are no longer have concurrent duplicates, when adding cooldown for a skill already in cooldown the timer is modified instead. http://hercules.ws/board/tracker/issue-7723-skill-blockpc-end-error Special Thanks to Haru, Wend and Beret. Also fixed skill cooldown duration/total display for characters that relog with a skill cooldown on clients 20120604 or higher Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 82eb01ca9..7aacd8e90 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17733,12 +17733,13 @@ void clif_skill_cooldown_list(int fd, struct skill_cd* cd) {
for( i = 0; i < cd->cursor; i++ ) {
if( cd->entry[i]->duration < 1 ) continue;
- WFIFOW(fd, 4 + (count*offset)) = cd->entry[i]->skill_id;
- WFIFOL(fd, 6 + (count*offset)) = cd->entry[i]->duration;
+ WFIFOW(fd, 4 + (count*offset)) = cd->entry[i]->skill_id;
#if PACKETVER >= 20120604
+ WFIFOL(fd, 6 + (count*offset)) = cd->entry[i]->total;
WFIFOL(fd, 10 + (count*offset)) = cd->entry[i]->duration;
+#else
+ WFIFOL(fd, 6 + (count*offset)) = cd->entry[i]->duration;
#endif
-
count++;
}