diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-01-16 22:41:55 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-01-16 22:41:55 +0100 |
commit | 952c53eb4eb3178f70f1910baabda877da00dfa3 (patch) | |
tree | 5dee304a3afe014561b6dd1ddb08979c92e653a0 | |
parent | Really did what xoft wanted (diff) | |
download | cuberite-952c53eb4eb3178f70f1910baabda877da00dfa3.tar cuberite-952c53eb4eb3178f70f1910baabda877da00dfa3.tar.gz cuberite-952c53eb4eb3178f70f1910baabda877da00dfa3.tar.bz2 cuberite-952c53eb4eb3178f70f1910baabda877da00dfa3.tar.lz cuberite-952c53eb4eb3178f70f1910baabda877da00dfa3.tar.xz cuberite-952c53eb4eb3178f70f1910baabda877da00dfa3.tar.zst cuberite-952c53eb4eb3178f70f1910baabda877da00dfa3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Item.cpp | 19 | ||||
-rw-r--r-- | src/Item.h | 6 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/Item.cpp b/src/Item.cpp index 58b3d41c9..9170006b6 100644 --- a/src/Item.cpp +++ b/src/Item.cpp @@ -99,25 +99,6 @@ bool cItem::IsFullStack(void) const -void cItem::CustomCopy(cItem & a_OtherItem, bool a_CopyType, bool a_CopyCount, bool a_CopyDamage, bool a_CopyEnchantments, bool a_CopyCustomName, bool a_CopyLore) -{ - if (a_CopyType) - m_ItemType = a_OtherItem.m_ItemType; - if (a_CopyCount) - m_ItemCount = a_OtherItem.m_ItemCount; - if (a_CopyDamage) - m_ItemDamage = a_OtherItem.m_ItemDamage; - if (a_CopyEnchantments) - m_Enchantments = a_OtherItem.m_Enchantments; - if (a_CopyCustomName) - m_CustomName = a_OtherItem.m_CustomName; - if (a_CopyLore) - m_Lore = a_OtherItem.m_Lore; -} - - - - char cItem::GetMaxStackSize(void) const { diff --git a/src/Item.h b/src/Item.h index 534632e2e..727965112 100644 --- a/src/Item.h +++ b/src/Item.h @@ -133,11 +133,7 @@ public: bool IsCustomNameEmpty(void) const { return (m_CustomName.empty()); } - bool IsLoreEmpty(void) const { return (m_Lore.empty()); } - - /** Copies specified internal variables from another item to this item */ - void CustomCopy(cItem & a_OtherItem, bool a_CopyType, bool a_CopyCount, bool a_CopyDamage, bool a_CopyEnchantments, bool a_CopyCustomName, bool a_CopyLore); - + bool IsLoreEmpty(void) const { return (m_Lore.empty()); } /// Returns a copy of this item with m_ItemCount set to 1. Useful to preserve enchantments etc. on stacked items cItem CopyOne(void) const; |