diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-07-28 21:49:20 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-07-28 21:49:20 +0300 |
commit | 41e471613e25961e25517de811aa131da033e0f1 (patch) | |
tree | b349078bfcc4f46a3cd5406cd7830ddaaa10da46 | |
parent | 7fa49d71fd0327de46688dc04a10573b0f8d1b5d (diff) | |
download | mv-41e471613e25961e25517de811aa131da033e0f1.tar.gz mv-41e471613e25961e25517de811aa131da033e0f1.tar.bz2 mv-41e471613e25961e25517de811aa131da033e0f1.tar.xz mv-41e471613e25961e25517de811aa131da033e0f1.zip |
move bools in shopitem.
-rw-r--r-- | src/shopitem.cpp | 12 | ||||
-rw-r--r-- | src/shopitem.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/shopitem.cpp b/src/shopitem.cpp index af773bb2a..56f66478e 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -33,10 +33,10 @@ ShopItem::ShopItem(const int inventoryIndex, const int id, const unsigned char color, const int quantity, const int price) : Item(id, 0, 0, color), - mPrice(price), mDisplayName(), - mShowQuantity(true), - mDuplicates() + mDuplicates(), + mPrice(price), + mShowQuantity(true) { if (serverVersion > 0) { @@ -57,10 +57,10 @@ ShopItem::ShopItem(const int inventoryIndex, const int id, ShopItem::ShopItem(const int id, const unsigned char color, const int price) : Item(id, 0, 0, color), - mPrice(price), mDisplayName(), - mShowQuantity(false), - mDuplicates() + mDuplicates(), + mPrice(price), + mShowQuantity(false) { if (serverVersion > 0) { diff --git a/src/shopitem.h b/src/shopitem.h index bf8fd20f2..8eeaadb92 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -132,9 +132,7 @@ class ShopItem final : public Item { return mDisplayName; } protected: - int mPrice; std::string mDisplayName; - bool mShowQuantity; /** * Struct to keep track of duplicates. @@ -145,6 +143,8 @@ class ShopItem final : public Item int quantity; } DuplicateItem; std::stack<DuplicateItem*> mDuplicates; /** <-- Stores duplicates */ + int mPrice; + bool mShowQuantity; }; #endif // SHOPITEM_H |