From 39579a7da48cbbe135d16cbe211ac43ca74e9156 Mon Sep 17 00:00:00 2001
From: lordttseven <lordttseven@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 3 Mar 2012 13:15:01 +0000
Subject: * 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
---
 src/map/itemdb.h | 10 ++++++----
 src/map/script.c |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

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...
-- 
cgit v1.2.3-70-g09d2