- Added a message to @clearweather stating when climate changes will dispel.

- Corrected @hidenpc saying that it's command name was "@npcoff"
- Updated itemdb reading on the char-sql server so that it reads both item_db and item_db2 files (totally untested yet as I can't compile SQL here x.x)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8545 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 18 insertions, 15 deletions

diff --git a/src/char_sql/itemdb.h b/src/char_sql/itemdb.h
index 350e42b2c..972df5385 100644
--- a/src/char_sql/itemdb.h
+++ b/src/char_sql/itemdb.h
@@ -5,25 +5,28 @@
 #define _ITEMDB_H_

 #include "mmo.h"

 

+//FIXME: Maybe it would be better to move this enum to mmo.h,

+//instead of having it twice on the map server and here? [Skotlex]

+enum {

+	IT_HEALING = 0,

+	IT_UNKNOWN, //1

+	IT_USABLE,  //2

+	IT_ETC,     //3

+	IT_WEAPON,  //4

+	IT_ARMOR,   //5

+	IT_CARD,    //6

+	IT_PETEGG,  //7

+	IT_PETARMOR,//8

+	IT_UNKNOWN2,//9

+	IT_AMMO,    //10

+	IT_DELAYCONSUME,//11

+	IT_MAX 

+} item_types;

+

 struct item_data {

 	int nameid;

 	char name[ITEM_NAME_LENGTH],jname[ITEM_NAME_LENGTH];

-	int value_buy,value_sell,value_notdc,value_notoc;

 	int type;

-	int class_;

-	int sex;

-	int equip;

-	int weight;

-	int atk;

-	int def;

-	int range;

-	int slot;

-	int look;

-	int elv;

-	int wlv;

-	char *use_script;	// 回復とかも全部この中でやろうかなと

-	char *equip_script;	// 攻撃,防御の属性設定もこの中で可能かな?

-	char available;

 };

 

 struct item_data* itemdb_search(int nameid);