diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-07-15 22:31:48 +0200 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-07-15 22:31:48 +0200 |
| commit | 8b74adcfab2a39b8d663f9ebc21cc4cde42761ef (patch) | |
| tree | bbb45c47667db874f73f57fd8fa55bac4f5f72c4 /src/Item.h | |
| parent | Merge pull request #2350 from SamJBarney/PeonySnowFix (diff) | |
| parent | Leather Armor can now be dyed. (diff) | |
| download | cuberite-8b74adcfab2a39b8d663f9ebc21cc4cde42761ef.tar cuberite-8b74adcfab2a39b8d663f9ebc21cc4cde42761ef.tar.gz cuberite-8b74adcfab2a39b8d663f9ebc21cc4cde42761ef.tar.bz2 cuberite-8b74adcfab2a39b8d663f9ebc21cc4cde42761ef.tar.lz cuberite-8b74adcfab2a39b8d663f9ebc21cc4cde42761ef.tar.xz cuberite-8b74adcfab2a39b8d663f9ebc21cc4cde42761ef.tar.zst cuberite-8b74adcfab2a39b8d663f9ebc21cc4cde42761ef.zip | |
Diffstat (limited to 'src/Item.h')
| -rw-r--r-- | src/Item.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Item.h b/src/Item.h index 056b5eb8a..8f47c4177 100644 --- a/src/Item.h +++ b/src/Item.h @@ -12,6 +12,7 @@ #include "Defines.h" #include "Enchantments.h" #include "WorldStorage/FireworksSerializer.h" +#include "Color.h" @@ -19,6 +20,7 @@ // fwd: class cItemHandler; +class cColor; namespace Json { @@ -41,7 +43,8 @@ public: m_CustomName(""), m_Lore(""), m_RepairCost(0), - m_FireworkItem() + m_FireworkItem(), + m_ItemColor() { } @@ -62,7 +65,8 @@ public: m_CustomName (a_CustomName), m_Lore (a_Lore), m_RepairCost (0), - m_FireworkItem() + m_FireworkItem(), + m_ItemColor() { if (!IsValidItem(m_ItemType)) { @@ -105,6 +109,7 @@ public: m_Lore = ""; m_RepairCost = 0; m_FireworkItem.EmptyData(); + m_ItemColor.Clear(); } @@ -114,6 +119,7 @@ public: m_ItemCount = 0; m_ItemDamage = 0; m_RepairCost = 0; + m_ItemColor.Clear(); } @@ -206,6 +212,7 @@ public: int m_RepairCost; cFireworkItem m_FireworkItem; + cColor m_ItemColor; }; // tolua_end |