diff options
| author | Samuel Barney <samjbarney@gmail.com> | 2015-07-14 02:15:37 +0200 |
|---|---|---|
| committer | Samuel Barney <samjbarney@gmail.com> | 2015-07-15 22:05:36 +0200 |
| commit | 561296f2699bcfff93d22b8a67182308998cfb31 (patch) | |
| tree | 7e0c13beb4b3933923d57c5755b82c76da1a9db9 /src/Item.h | |
| parent | Merge pull request #2347 from SamJBarney/ClampFix (diff) | |
| download | cuberite-561296f2699bcfff93d22b8a67182308998cfb31.tar cuberite-561296f2699bcfff93d22b8a67182308998cfb31.tar.gz cuberite-561296f2699bcfff93d22b8a67182308998cfb31.tar.bz2 cuberite-561296f2699bcfff93d22b8a67182308998cfb31.tar.lz cuberite-561296f2699bcfff93d22b8a67182308998cfb31.tar.xz cuberite-561296f2699bcfff93d22b8a67182308998cfb31.tar.zst cuberite-561296f2699bcfff93d22b8a67182308998cfb31.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 |