diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/extract.cpp | 18 | ||||
| -rw-r--r-- | src/common/mmo.hpp | 10 |
2 files changed, 11 insertions, 17 deletions
diff --git a/src/common/extract.cpp b/src/common/extract.cpp index 5c07e24..378986d 100644 --- a/src/common/extract.cpp +++ b/src/common/extract.cpp @@ -44,19 +44,19 @@ bool extract(XString str, struct global_reg *var) bool extract(XString str, struct item *it) { - it->broken = 0; + XString ignored; return extract(str, record<',', 11>( &it->id, &it->nameid, &it->amount, &it->equip, - &it->identify, - &it->refine, - &it->attribute, - &it->card[0], - &it->card[1], - &it->card[2], - &it->card[3], - &it->broken)); + &ignored, + &ignored, + &ignored, + &ignored, + &ignored, + &ignored, + &ignored, + &ignored)); } diff --git a/src/common/mmo.hpp b/src/common/mmo.hpp index 67123d9..bb30682 100644 --- a/src/common/mmo.hpp +++ b/src/common/mmo.hpp @@ -18,7 +18,6 @@ constexpr int MAX_MAP_PER_SERVER = 512; constexpr int MAX_INVENTORY = 100; constexpr int MAX_AMOUNT = 30000; constexpr int MAX_ZENY = 1000000000; // 1G zeny -constexpr int MAX_CART = 100; enum class SkillID : uint16_t; constexpr SkillID MAX_SKILL = SkillID(474); // not 450 @@ -173,11 +172,6 @@ struct item short nameid; short amount; EPOS equip; - uint8_t identify; - uint8_t refine; - uint8_t attribute; - short card[4]; - short broken; }; struct point @@ -327,8 +321,8 @@ struct CharData unsigned long mapip; unsigned int mapport; - struct point last_point, save_point, memo_point[10]; - struct item inventory[MAX_INVENTORY], cart[MAX_CART]; + struct point last_point, save_point; + struct item inventory[MAX_INVENTORY]; earray<skill_value, SkillID, MAX_SKILL> skill; int global_reg_num; struct global_reg global_reg[GLOBAL_REG_NUM]; |