summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-20 13:56:37 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-20 13:56:37 +0000
commitd11101c061a9571c34dbbe66534a3a4f1afa99b3 (patch)
tree53f5ed5dd9f5f1ba81521d8511bdbf9206db456e
parent10b8e42b412b94242b66806f6e179252b111deea (diff)
downloadhercules-d11101c061a9571c34dbbe66534a3a4f1afa99b3.tar.gz
hercules-d11101c061a9571c34dbbe66534a3a4f1afa99b3.tar.bz2
hercules-d11101c061a9571c34dbbe66534a3a4f1afa99b3.tar.xz
hercules-d11101c061a9571c34dbbe66534a3a4f1afa99b3.zip
- Should have fixed @refine applying multiple times to equipment that uses multiple equip slots.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7762 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/atcommand.c8
2 files changed, 11 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 02e79de68..ae45acad4 100644
--- a/Changelog-Trunk.txt
+++ b/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.
+2006/07/20
+ * Should have fixed @refine applying multiple times to equipment that uses
+ multiple equip slots. [Skotlex]
2006/07/19
* Fixed the inf code update breakage which was blocking all offensive
skills. [Skotlex]
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index d22483f8a..d5d2ce661 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3769,8 +3769,16 @@ int atcommand_refine(
for (j = 0; j < EQI_MAX-1; j++) {
if ((i = sd->equip_index[j]) < 0)
continue;
+ if(j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == i)
+ continue;
+ if(j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == i)
+ continue;
+ if(j == EQI_HEAD_TOP && (sd->equip_index[EQI_HEAD_MID] == i || sd->equip_index[EQI_HEAD_LOW] == i))
+ continue;
+
if(position && !(sd->status.inventory[i].equip & position))
continue;
+
final_refine = sd->status.inventory[i].refine + refine;
if (final_refine > MAX_REFINE)
final_refine = MAX_REFINE;