diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-16 11:25:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-16 11:25:52 +0200 |
commit | 76be103a91d6987527af19e87d93007be8ba8a67 (patch) | |
tree | c83c21e7c0adc37251f77788023eb3c242a751ca /src/craftdef.h | |
parent | 49d6e5f4ab79078d1608c22a9cce286b3cf86eb9 (diff) | |
download | minetest-76be103a91d6987527af19e87d93007be8ba8a67.tar.gz minetest-76be103a91d6987527af19e87d93007be8ba8a67.tar.bz2 minetest-76be103a91d6987527af19e87d93007be8ba8a67.zip |
C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) (#5984)
* C++11 patchset 9: move hardcoded init parameters to class definitions
C++11 introduced the possibility to define the default values directly in class definitions, do it on current code
Also remove some unused attributes
* CollisionInfo::bouncy
* collisionMoveResult::collides_xy
* collisionMoveResult::standing_on_unloaded
* Clouds::speed
* More constructor cleanups + some variables removal
* remove only write guiFormSpecMenu::m_old_tooltip
* move header included inside defintions in genericobject.h
* remove some unused since years exception classes
* remove unused & empty debug_stacks_init
* remove unused & empty content_nodemeta_serialize_legacy
* remove forgotten useless bool (bouncy) in collision.cpp code
Diffstat (limited to 'src/craftdef.h')
-rw-r--r-- | src/craftdef.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/craftdef.h b/src/craftdef.h index bdd741f7c..fddff6cef 100644 --- a/src/craftdef.h +++ b/src/craftdef.h @@ -70,17 +70,17 @@ const int craft_hash_type_max = (int) CRAFT_HASH_TYPE_UNHASHED; */ struct CraftInput { - CraftMethod method; - unsigned int width; + CraftMethod method = CRAFT_METHOD_NORMAL; + unsigned int width = 0; std::vector<ItemStack> items; - CraftInput(): - method(CRAFT_METHOD_NORMAL), width(0), items() - {} + CraftInput() {} + CraftInput(CraftMethod method_, unsigned int width_, const std::vector<ItemStack> &items_): method(method_), width(width_), items(items_) {} + std::string dump() const; }; @@ -90,13 +90,12 @@ struct CraftInput struct CraftOutput { // Used for normal crafting and cooking, itemstring - std::string item; + std::string item = ""; // Used for cooking (cook time) and fuel (burn time), seconds - float time; + float time = 0.0f; + + CraftOutput() {} - CraftOutput(): - item(""), time(0) - {} CraftOutput(const std::string &item_, float time_): item(item_), time(time_) {} @@ -171,16 +170,15 @@ public: class CraftDefinitionShaped: public CraftDefinition { public: - CraftDefinitionShaped(): - output(""), width(1), recipe(), hash_inited(false), replacements() - {} + CraftDefinitionShaped() {} + CraftDefinitionShaped( const std::string &output_, unsigned int width_, const std::vector<std::string> &recipe_, const CraftReplacements &replacements_): output(output_), width(width_), recipe(recipe_), - hash_inited(false), replacements(replacements_) + replacements(replacements_) {} virtual ~CraftDefinitionShaped(){} @@ -200,15 +198,15 @@ public: private: // Output itemstring - std::string output; + std::string output = ""; // Width of recipe - unsigned int width; + unsigned int width = 1; // Recipe matrix (itemstrings) std::vector<std::string> recipe; // Recipe matrix (item names) std::vector<std::string> recipe_names; // bool indicating if initHash has been called already - bool hash_inited; + bool hash_inited = false; // Replacement items for decrementInput() CraftReplacements replacements; }; |