summaryrefslogtreecommitdiffstats
path: root/src/Item.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Item.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Item.h b/src/Item.h
index 00316c188..8eb0a1f4e 100644
--- a/src/Item.h
+++ b/src/Item.h
@@ -64,7 +64,7 @@ public:
{
if (!IsValidItem(m_ItemType))
{
- if (m_ItemType != E_BLOCK_AIR)
+ if ((m_ItemType != E_BLOCK_AIR) && (m_ItemType != E_ITEM_EMPTY))
{
LOGWARNING("%s: creating an invalid item type (%d), resetting to empty.", __FUNCTION__, a_ItemType);
}
@@ -73,6 +73,10 @@ public:
}
+ // The constructor is disabled in code, because the compiler generates it anyway,
+ // but it needs to stay because ToLua needs to generate the binding for it
+ #if 0
+
/** Creates an exact copy of the item */
cItem(const cItem & a_CopyFrom) :
m_ItemType (a_CopyFrom.m_ItemType),
@@ -85,6 +89,8 @@ public:
{
}
+ #endif
+
void Empty(void)
{