Kaynağa Gözat

* Fixed Converters not overwriting each other
- thanks to scerez for the fix

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10490 54d463be-8e91-2dee-dedb-b68131a5f0ec

Playtester 18 yıl önce
ebeveyn
işleme
4cf50757dd
3 değiştirilmiş dosya ile 6 ekleme ve 0 silme
  1. 3 0
      Changelog-Trunk.txt
  2. 2 0
      src/map/skill.c
  3. 1 0
      src/map/status.c

+ 3 - 0
Changelog-Trunk.txt

@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/05/07
+	* Fixed Converters not overwriting each other [Playtester]
+	- thanks to scerez for the fix
 2007/05/06
 	* Removed the dependency on winsock.h for definitions, it's all winsock2.h now.
 	* Minor documentation/re-coding in chat.c.

+ 2 - 0
src/map/skill.c

@@ -9683,6 +9683,8 @@ int skill_enchant_elemental_end (struct block_list *bl, int type)
 		status_change_end(bl, SC_SHADOWWEAPON, -1);
 	if (type != SC_GHOSTWEAPON && sc->data[SC_GHOSTWEAPON].timer != -1)
 		status_change_end(bl, SC_GHOSTWEAPON, -1);
+	if (type != SC_ENCHANTARMS && sc->data[SC_ENCHANTARMS].timer != -1)
+		status_change_end(bl, SC_ENCHANTARMS, -1);
 	return 0;
 }
 

+ 1 - 0
src/map/status.c

@@ -5755,6 +5755,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 				val2 = val2%ELE_MAX;
 			else if (val2 < 0)
 				val2 = rand()%ELE_MAX;
+				skill_enchant_elemental_end(bl,type);
 			break;
 		case SC_ARMOR_ELEMENT:
 			//Place here SCs that have no SCB_* data, no skill associated, no ICON