X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcraftdef.h;h=46ee2164e6057f9bc7fffe527ea548ff92fc9156;hb=f4fedfed070ffd85c3446bc5d38d2fbd577640d6;hp=695ee0c2c2fa1f7aebac0e516b1a4b32c3abacf3;hpb=281e9f39fdffd106e79122ae23e2b5443a5daea3;p=dragonfireclient.git diff --git a/src/craftdef.h b/src/craftdef.h index 695ee0c2c..46ee2164e 100644 --- a/src/craftdef.h +++ b/src/craftdef.h @@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef CRAFTDEF_HEADER -#define CRAFTDEF_HEADER +#pragma once #include #include @@ -70,17 +69,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 items; - CraftInput(): - method(CRAFT_METHOD_NORMAL), width(0), items() - {} + CraftInput() = default; + CraftInput(CraftMethod method_, unsigned int width_, const std::vector &items_): method(method_), width(width_), items(items_) {} + std::string dump() const; }; @@ -90,14 +89,13 @@ 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(): - item(""), time(0) - {} - CraftOutput(std::string item_, float time_): + CraftOutput() = default; + + CraftOutput(const std::string &item_, float time_): item(item_), time(time_) {} std::string dump() const; @@ -121,10 +119,8 @@ struct CraftReplacements // List of replacements std::vector > pairs; - CraftReplacements(): - pairs() - {} - CraftReplacements(std::vector > pairs_): + CraftReplacements() = default; + CraftReplacements(const std::vector > &pairs_): pairs(pairs_) {} std::string dump() const; @@ -136,8 +132,8 @@ struct CraftReplacements class CraftDefinition { public: - CraftDefinition(){} - virtual ~CraftDefinition(){} + CraftDefinition() = default; + virtual ~CraftDefinition() = default; // Returns type of crafting definition virtual std::string getName() const=0; @@ -171,18 +167,17 @@ class CraftDefinition class CraftDefinitionShaped: public CraftDefinition { public: - CraftDefinitionShaped(): - output(""), width(1), recipe(), hash_inited(false), replacements() - {} + CraftDefinitionShaped() = delete; + CraftDefinitionShaped( const std::string &output_, unsigned int width_, const std::vector &recipe_, const CraftReplacements &replacements_): output(output_), width(width_), recipe(recipe_), - hash_inited(false), replacements(replacements_) + replacements(replacements_) {} - virtual ~CraftDefinitionShaped(){} + virtual ~CraftDefinitionShaped() = default; virtual std::string getName() const; virtual bool check(const CraftInput &input, IGameDef *gamedef) const; @@ -200,15 +195,15 @@ class CraftDefinitionShaped: public CraftDefinition private: // Output itemstring - std::string output; + std::string output = ""; // Width of recipe - unsigned int width; + unsigned int width = 1; // Recipe matrix (itemstrings) std::vector recipe; // Recipe matrix (item names) std::vector recipe_names; // bool indicating if initHash has been called already - bool hash_inited; + bool hash_inited = false; // Replacement items for decrementInput() CraftReplacements replacements; }; @@ -221,17 +216,14 @@ class CraftDefinitionShaped: public CraftDefinition class CraftDefinitionShapeless: public CraftDefinition { public: - CraftDefinitionShapeless(): - output(""), recipe(), hash_inited(false), replacements() - {} + CraftDefinitionShapeless() = delete; CraftDefinitionShapeless( const std::string &output_, const std::vector &recipe_, const CraftReplacements &replacements_): - output(output_), recipe(recipe_), - hash_inited(false), replacements(replacements_) + output(output_), recipe(recipe_), replacements(replacements_) {} - virtual ~CraftDefinitionShapeless(){} + virtual ~CraftDefinitionShapeless() = default; virtual std::string getName() const; virtual bool check(const CraftInput &input, IGameDef *gamedef) const; @@ -255,7 +247,7 @@ class CraftDefinitionShapeless: public CraftDefinition // Recipe list (item names) std::vector recipe_names; // bool indicating if initHash has been called already - bool hash_inited; + bool hash_inited = false; // Replacement items for decrementInput() CraftReplacements replacements; }; @@ -269,13 +261,11 @@ class CraftDefinitionShapeless: public CraftDefinition class CraftDefinitionToolRepair: public CraftDefinition { public: - CraftDefinitionToolRepair(): - additional_wear(0) - {} + CraftDefinitionToolRepair() = delete; CraftDefinitionToolRepair(float additional_wear_): additional_wear(additional_wear_) {} - virtual ~CraftDefinitionToolRepair(){} + virtual ~CraftDefinitionToolRepair() = default; virtual std::string getName() const; virtual bool check(const CraftInput &input, IGameDef *gamedef) const; @@ -297,7 +287,7 @@ class CraftDefinitionToolRepair: public CraftDefinition // 1 = new tool is completely broken // 0 = simply add remaining uses of both input tools // -1 = new tool is completely pristine - float additional_wear; + float additional_wear = 0.0f; }; /* @@ -307,18 +297,15 @@ class CraftDefinitionToolRepair: public CraftDefinition class CraftDefinitionCooking: public CraftDefinition { public: - CraftDefinitionCooking(): - output(""), recipe(""), hash_inited(false), cooktime() - {} + CraftDefinitionCooking() = delete; CraftDefinitionCooking( const std::string &output_, const std::string &recipe_, float cooktime_, const CraftReplacements &replacements_): - output(output_), recipe(recipe_), hash_inited(false), - cooktime(cooktime_), replacements(replacements_) + output(output_), recipe(recipe_), cooktime(cooktime_), replacements(replacements_) {} - virtual ~CraftDefinitionCooking(){} + virtual ~CraftDefinitionCooking() = default; virtual std::string getName() const; virtual bool check(const CraftInput &input, IGameDef *gamedef) const; @@ -342,7 +329,7 @@ class CraftDefinitionCooking: public CraftDefinition // Recipe item name std::string recipe_name; // bool indicating if initHash has been called already - bool hash_inited; + bool hash_inited = false; // Time in seconds float cooktime; // Replacement items for decrementInput() @@ -356,15 +343,13 @@ class CraftDefinitionCooking: public CraftDefinition class CraftDefinitionFuel: public CraftDefinition { public: - CraftDefinitionFuel(): - recipe(""), hash_inited(false), burntime() - {} - CraftDefinitionFuel(std::string recipe_, + CraftDefinitionFuel() = delete; + CraftDefinitionFuel(const std::string &recipe_, float burntime_, const CraftReplacements &replacements_): - recipe(recipe_), hash_inited(false), burntime(burntime_), replacements(replacements_) + recipe(recipe_), burntime(burntime_), replacements(replacements_) {} - virtual ~CraftDefinitionFuel(){} + virtual ~CraftDefinitionFuel() = default; virtual std::string getName() const; virtual bool check(const CraftInput &input, IGameDef *gamedef) const; @@ -386,7 +371,7 @@ class CraftDefinitionFuel: public CraftDefinition // Recipe item name std::string recipe_name; // bool indicating if initHash has been called already - bool hash_inited; + bool hash_inited = false; // Time in seconds float burntime; // Replacement items for decrementInput() @@ -399,8 +384,8 @@ class CraftDefinitionFuel: public CraftDefinition class ICraftDefManager { public: - ICraftDefManager(){} - virtual ~ICraftDefManager(){} + ICraftDefManager() = default; + virtual ~ICraftDefManager() = default; // The main crafting function virtual bool getCraftResult(CraftInput &input, CraftOutput &output, @@ -416,8 +401,8 @@ class ICraftDefManager class IWritableCraftDefManager : public ICraftDefManager { public: - IWritableCraftDefManager(){} - virtual ~IWritableCraftDefManager(){} + IWritableCraftDefManager() = default; + virtual ~IWritableCraftDefManager() = default; // The main crafting function virtual bool getCraftResult(CraftInput &input, CraftOutput &output, @@ -445,6 +430,3 @@ class IWritableCraftDefManager : public ICraftDefManager }; IWritableCraftDefManager* createCraftDefManager(); - -#endif -