summaryrefslogtreecommitdiff
path: root/src/inventory.h
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-06-17 19:11:28 +0200
committerGitHub <noreply@github.com>2017-06-17 19:11:28 +0200
commit8f7785771b9e02b1a1daf7a252550d78ea93053d (patch)
tree7a4e4b524dbc63fed3dac99a3844b634cc621d0d /src/inventory.h
parent76be103a91d6987527af19e87d93007be8ba8a67 (diff)
downloadminetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.gz
minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.bz2
minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.zip
Cpp11 initializers 2 (#5999)
* C++11 patchset 10: continue cleanup on constructors * Drop obsolete bool MainMenuData::enable_public (setting is called with cURL in server loop) * More classes cleanup * More classes cleanup + change NULL tests to boolean tests
Diffstat (limited to 'src/inventory.h')
-rw-r--r--src/inventory.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/inventory.h b/src/inventory.h
index a9fef3b05..e3e818708 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -33,7 +33,7 @@ struct ToolCapabilities;
struct ItemStack
{
- ItemStack(): name(""), count(0), wear(0) {}
+ ItemStack() {}
ItemStack(const std::string &name_, u16 count_,
u16 wear, IItemDefManager *itemdef);
@@ -164,9 +164,9 @@ struct ItemStack
/*
Properties
*/
- std::string name;
- u16 count;
- u16 wear;
+ std::string name = "";
+ u16 count = 0;
+ u16 wear = 0;
ItemStackMetadata metadata;
};
@@ -252,7 +252,8 @@ public:
private:
std::vector<ItemStack> m_items;
std::string m_name;
- u32 m_size, m_width;
+ u32 m_size;
+ u32 m_width = 0;
IItemDefManager *m_itemdef;
};
@@ -307,7 +308,7 @@ private:
std::vector<InventoryList*> m_lists;
IItemDefManager *m_itemdef;
- bool m_dirty;
+ bool m_dirty = false;
};
#endif