Переглянути джерело

* fixed getiteminfo offset being off by one in REMODE (bugreport:5378)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15652 54d463be-8e91-2dee-dedb-b68131a5f0ec
lordttseven 13 роки тому
батько
коміт
9f938e0c70
2 змінених файлів з 8 додано та 4 видалено
  1. 6 4
      src/map/itemdb.h
  2. 2 0
      src/map/script.c

+ 6 - 4
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...

+ 2 - 0
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...