summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlordttseven <lordttseven@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-03 13:15:01 +0000
committerlordttseven <lordttseven@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-03 13:15:01 +0000
commit39579a7da48cbbe135d16cbe211ac43ca74e9156 (patch)
tree3aec98ab4f4120c652ef6f7c39e3ff9ff982f0d3 /src
parente27e10c71f915a69f83bf81b5d0911375313f055 (diff)
downloadhercules-39579a7da48cbbe135d16cbe211ac43ca74e9156.tar.gz
hercules-39579a7da48cbbe135d16cbe211ac43ca74e9156.tar.bz2
hercules-39579a7da48cbbe135d16cbe211ac43ca74e9156.tar.xz
hercules-39579a7da48cbbe135d16cbe211ac43ca74e9156.zip
* fixed getiteminfo offset being off by one in REMODE (bugreport:5378)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15652 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/itemdb.h10
-rw-r--r--src/map/script.c2
2 files changed, 8 insertions, 4 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 9b9ee939f..faab04fed 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -56,7 +56,8 @@ enum item_itemid
struct item_data {
int nameid;
char name[ITEM_NAME_LENGTH],jname[ITEM_NAME_LENGTH];
- //Do not add stuff between value_buy and wlv (see how getiteminfo works)
+
+ //Do not add stuff between value_buy and view_id (see how getiteminfo works)
int value_buy;
int value_sell;
int type;
@@ -65,9 +66,6 @@ struct item_data {
int equip;
int weight;
int atk;
-#if REMODE
- int matk;//[RRInd] -- used in RE for matk
-#endif
int def;
int range;
int slot;
@@ -75,6 +73,10 @@ struct item_data {
int elv;
int wlv;
int view_id;
+#if REMODE
+ int matk;//[RRInd] -- used in RE for matk
+#endif
+
int delay;
//Lupus: I rearranged order of these fields due to compatibility with ITEMINFO script command
// some script commands should be revised as well...
diff --git a/src/map/script.c b/src/map/script.c
index d3d28a84e..29387fe4e 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10846,6 +10846,8 @@ BUILDIN_FUNC(getitemslots)
return 0;
}
+// TODO: add matk here if needed/once we get rid of REMODE
+
/*==========================================
* Returns some values of an item [Lupus]
* Price, Weight, etc...