diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-07-28 21:37:40 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-07-28 21:37:40 +0300 |
commit | 7fa49d71fd0327de46688dc04a10573b0f8d1b5d (patch) | |
tree | 00958030239868fe90d0a6bcc558755171c5f52d | |
parent | 2252ad319bf6c8c21f1c58d89a35def0e6fac07f (diff) | |
download | plus-7fa49d71fd0327de46688dc04a10573b0f8d1b5d.tar.gz plus-7fa49d71fd0327de46688dc04a10573b0f8d1b5d.tar.bz2 plus-7fa49d71fd0327de46688dc04a10573b0f8d1b5d.tar.xz plus-7fa49d71fd0327de46688dc04a10573b0f8d1b5d.zip |
move bools in item.
-rw-r--r-- | src/item.cpp | 10 | ||||
-rw-r--r-- | src/item.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/item.cpp b/src/item.cpp index 5f5b7120a..6bb6f206e 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -44,13 +44,13 @@ Item::Item(const int id, const int quantity, const int refine, mColor(0), mQuantity(quantity), mImage(nullptr), - mEquipment(equipment), - mEquipped(equipped), - mInEquipment(false), + mDescription(), + mTags(), mRefine(refine), mInvIndex(0), - mDescription(), - mTags() + mEquipment(equipment), + mEquipped(equipped), + mInEquipment(false) { setId(id, color); } diff --git a/src/item.h b/src/item.h index 4e1772d2f..d8ede3995 100644 --- a/src/item.h +++ b/src/item.h @@ -172,13 +172,13 @@ class Item protected: Image *mImage; /**< Item image. */ + std::string mDescription; + std::map <int, int> mTags; + int mRefine; /**< Item refine level. */ + int mInvIndex; /**< Inventory index. */ bool mEquipment; /**< Item is equipment. */ bool mEquipped; /**< Item is equipped. */ bool mInEquipment; /**< Item is in equipment */ - int mRefine; /**< Item refine level. */ - int mInvIndex; /**< Inventory index. */ - std::string mDescription; - std::map <int, int> mTags; }; #endif // ITEM_H |