* The delay icon doesn't appear during casting now. (bugreport:3101)

* Status icon of ASPD potions doesn't overriding each other now.(bugreport:3095)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13802 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 10 insertions, 12 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 962ce1842..2c945eea3 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -10,6 +10,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 	- Skill's self damage may now causes coma, equipment breaking and autospell/autoscript.
 	- GrandCross now allows you to drain hp/sp.
 	- Splash attack doesn't cause any status effects or autocasts any more.
+	* The delay icon doesn't appear during casting now.
+	* Status icon of ASPD potions doesn't overriding each other now.
 09/05/20
 	* Now fiberlocking a fiberlocked target doesn't renew the timer but instead increases its fireweakness [Inkfish]
 	- This makes doublecasting firebolts on a double fiberlocked target having double damage from both 2 bolts possible = =(bugreport:3061)
diff --git a/src/map/status.c b/src/map/status.c
index 802b5181e..7fe6b2326 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -447,10 +447,10 @@ void initChangeTables(void)
 	//Status that don't have a skill associated.
 	StatusIconChangeTable[SC_WEIGHT50] = SI_WEIGHT50;
 	StatusIconChangeTable[SC_WEIGHT90] = SI_WEIGHT90;
-	StatusIconChangeTable[SC_ASPDPOTION0] = SI_ASPDPOTION;
-	StatusIconChangeTable[SC_ASPDPOTION1] = SI_ASPDPOTION;
-	StatusIconChangeTable[SC_ASPDPOTION2] = SI_ASPDPOTION;
-	StatusIconChangeTable[SC_ASPDPOTION3] = SI_ASPDPOTION;
+	StatusIconChangeTable[SC_ASPDPOTION0] = SI_ASPDPOTION0;
+	StatusIconChangeTable[SC_ASPDPOTION1] = SI_ASPDPOTION1;
+	StatusIconChangeTable[SC_ASPDPOTION2] = SI_ASPDPOTION2;
+	StatusIconChangeTable[SC_ASPDPOTION3] = SI_ASPDPOTIONINFINITY;
 	StatusIconChangeTable[SC_SPEEDUP0] = SI_SPEEDPOTION1;
 	StatusIconChangeTable[SC_SPEEDUP1] = SI_SPEEDPOTION2;
 	StatusIconChangeTable[SC_INCSTR] = SI_INCSTR;
diff --git a/src/map/status.h b/src/map/status.h
index e127f8f5e..e6adb62b7 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -356,10 +356,10 @@ enum si_type {
 	SI_HALLUCINATION	= 34,
 	SI_WEIGHT50 		= 35,
 	SI_WEIGHT90		= 36,
-	SI_ASPDPOTION		= 37,
-//	SI_ASPDPOTION2 = 38,
-//	SI_ASPDPOTION3 = 39,
-//	SI_ASPDPOTIONINFINITY = 40,
+	SI_ASPDPOTION0		= 37,
+	SI_ASPDPOTION1 = 38,
+	SI_ASPDPOTION2 = 39,
+	SI_ASPDPOTIONINFINITY = 40,
 	SI_SPEEDPOTION1		= 41,
 	SI_SPEEDPOTION2		= 42,
 //	SI_AUTOCOUNTER = 43,
diff --git a/src/map/unit.c b/src/map/unit.c
index 485eb4d6e..3dd1b30e4 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1075,8 +1075,6 @@ 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 ( battle_config.display_status_timers && sd )
-		clif_status_change(src, SI_ACTIONDELAY, 1, casttime);
 	if( sd )
 	{
 		switch( skill_num )
@@ -1182,8 +1180,6 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh
 
 	ud->state.skillcastcancel = castcancel&&casttime>0?1:0;
 	ud->canact_tick  = tick + casttime + 100;
-	if ( battle_config.display_status_timers && sd )
-		clif_status_change(src, SI_ACTIONDELAY, 1, casttime);
 //	if( sd )
 //	{
 //		switch( skill_num )