summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-08 18:55:27 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-08 18:55:27 +0000
commit1aa92a51088162353e1dd14b4484f63b056bce60 (patch)
tree8d32c20cf8b54d7bbbc0727df00591a332ff85e9
parentab1cb1a8302dfbed055228eab43b890a5f919f81 (diff)
downloadhercules-1aa92a51088162353e1dd14b4484f63b056bce60.tar.gz
hercules-1aa92a51088162353e1dd14b4484f63b056bce60.tar.bz2
hercules-1aa92a51088162353e1dd14b4484f63b056bce60.tar.xz
hercules-1aa92a51088162353e1dd14b4484f63b056bce60.zip
* Fixed @item2 and script command 'getitem2' not taking MAX_REFINE define into consideration (bugreport:4804).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14739 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/atcommand.c4
-rw-r--r--src/map/script.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 481d83b04..b0e56fb60 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/03/08
+ * Fixed @item2 and script command 'getitem2' not taking MAX_REFINE define into consideration (bugreport:4804). [Ai4rei]
* Fixed @str/@agi/@vit/@int/@dex/@luk commands setting a stat to 0 (rather than 1), when exact amount is subtracted (bugreport:4803, since r14493). [Ai4rei]
2011/03/07
* Cleaned up packet dumping code. [Ai4rei]
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index f063110d2..b44eae946 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1673,8 +1673,8 @@ ACMD_FUNC(item2)
}
if (item_data->type == IT_PETARMOR)
refine = 0;
- if (refine > 10)
- refine = 10;
+ if (refine > MAX_REFINE)
+ refine = MAX_REFINE;
} else {
identify = 1;
refine = attr = 0;
diff --git a/src/map/script.c b/src/map/script.c
index 448630080..dec4a3f89 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5694,7 +5694,7 @@ BUILDIN_FUNC(getitem2)
if (item_data == NULL)
return -1;
if(item_data->type==IT_WEAPON || item_data->type==IT_ARMOR){
- if(ref > 10) ref = 10;
+ if(ref > MAX_REFINE) ref = MAX_REFINE;
}
else if(item_data->type==IT_PETEGG) {
iden = 1;