ソースを参照

Some fixes to my previous commit.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13618 54d463be-8e91-2dee-dedb-b68131a5f0ec
Sara 16 年 前
コミット
9189eb2c15
2 ファイル変更6 行追加6 行削除
  1. 2 2
      src/map/clif.c
  2. 4 4
      src/map/unit.c

+ 2 - 2
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;
 }

+ 4 - 4
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;