diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-01-17 18:36:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-01-17 19:19:58 +0300 |
| commit | 55cbf74cbe2c40b4592e72621e40f8858fc376d9 (patch) | |
| tree | 1adb70df7ddddde9a504d572a789e7afb5cae58c /src/resources | |
| parent | 261a118937d8b1cd41cf16d983f880e5957f84b1 (diff) | |
| download | mv-55cbf74cbe2c40b4592e72621e40f8858fc376d9.tar.gz mv-55cbf74cbe2c40b4592e72621e40f8858fc376d9.tar.bz2 mv-55cbf74cbe2c40b4592e72621e40f8858fc376d9.tar.xz mv-55cbf74cbe2c40b4592e72621e40f8858fc376d9.zip | |
Move cards constants into separate file.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/item/item.cpp | 2 | ||||
| -rw-r--r-- | src/resources/item/item.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/item/item.cpp b/src/resources/item/item.cpp index 3f67585ac..ae31dd94c 100644 --- a/src/resources/item/item.cpp +++ b/src/resources/item/item.cpp @@ -66,7 +66,7 @@ Item::Item(const int id, mFavorite(favorite) { setId(id, color); - for (int f = 0; f < 4; f ++) + for (int f = 0; f < maxCards; f ++) mCards[f] = 0; } diff --git a/src/resources/item/item.h b/src/resources/item/item.h index c287abd8c..9a910c31b 100644 --- a/src/resources/item/item.h +++ b/src/resources/item/item.h @@ -23,6 +23,8 @@ #ifndef RESOURCES_ITEM_ITEM_H #define RESOURCES_ITEM_ITEM_H +#include "const/resources/item/cards.h" + #include "enums/simpletypes/damaged.h" #include "enums/simpletypes/equipm.h" #include "enums/simpletypes/equipped.h" @@ -36,8 +38,6 @@ class Image; -const int maxCards = 4; - /** * Represents one or more instances of a certain item type. */ |