summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorSara <Sara@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-24 09:10:30 +0000
committerSara <Sara@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-24 09:10:30 +0000
commitf2f8ce801174d01ee34b334a43f2efcca03be74e (patch)
treef7f2a56b288be9541d1c21c2267b51ad36ab2ed4 /src/map
parentfec4057d5036be3f8f6a52c5cefc3061ffa2d4f0 (diff)
downloadhercules-f2f8ce801174d01ee34b334a43f2efcca03be74e.tar.gz
hercules-f2f8ce801174d01ee34b334a43f2efcca03be74e.tar.bz2
hercules-f2f8ce801174d01ee34b334a43f2efcca03be74e.tar.xz
hercules-f2f8ce801174d01ee34b334a43f2efcca03be74e.zip
Some fixes to my previous commit.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13618 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/unit.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 66a390568..2cb140a66 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4556,10 +4556,10 @@ int clif_status_change(struct block_list *bl,int type,int flag,unsigned int tick
WBUFL(buf,4)=bl->id;
WBUFB(buf,8)=flag;
if( battle_config.display_status_timers && tick>0 )
- clif_send(buf,packet_len(0x196),bl,AREA);
- else {
WBUFL(buf,9)=tick;
clif_send(buf,packet_len(0x43f),bl,AREA);
+ else {
+ clif_send(buf,packet_len(0x196),bl,AREA);
}
return 0;
}
diff --git a/src/map/unit.c b/src/map/unit.c
index 09790b643..d358e9979 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1070,7 +1070,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
ud->state.skillcastcancel = 0;
ud->canact_tick = tick + casttime + 100;
- if ( sd )
+ if ( battle_config.display_status_timers && sd )
clif_status_change(src, SI_ACTIONDELAY, 1, ud->canact_tick);
ud->skilltarget = target_id;
ud->skillx = 0;
@@ -1177,7 +1177,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh
ud->state.skillcastcancel=0;
ud->canact_tick = tick + casttime + 100;
- if ( sd )
+ if ( battle_config.display_status_timers && sd )
clif_status_change(src, SI_ACTIONDELAY, 1, ud->canact_tick);
ud->skillid = skill_num;
ud->skilllv = skill_lv;
@@ -1595,8 +1595,8 @@ int unit_skillcastcancel(struct block_list *bl,int type)
}
ud->canact_tick = tick;
- if ( sd )
- clif_status_change(bl, SI_ACTIONDELAY, 1, ud->canact_tick);
+ if ( battle_config.display_status_timers && sd )
+ clif_status_change(bl, SI_ACTIONDELAY, 0, 0);
if(type&1 && sd)
skill = sd->skillid_old;