minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prefix RecipePriority elements with PRIORITY_

This commit is contained in:
Paul Ouellette 2019-07-22 01:26:22 -04:00 committed by sfan5
parent 395b1b3346
commit fe6c666da2
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/craftdef.cpp
View File

@ -337,9 +337,9 @@ CraftDefinitionShaped::CraftDefinitionShaped(
output(output_), width(width_), recipe(recipe_), replacements(replacements_) output(output_), width(width_), recipe(recipe_), replacements(replacements_)
{ {
if (hasGroupItem(recipe)) if (hasGroupItem(recipe))
priority = SHAPED_AND_GROUPS; priority = PRIORITY_SHAPED_AND_GROUPS;
else else
priority = SHAPED; priority = PRIORITY_SHAPED;
} }
std::string CraftDefinitionShaped::getName() const std::string CraftDefinitionShaped::getName() const
@ -473,9 +473,9 @@ CraftDefinitionShapeless::CraftDefinitionShapeless(
output(output_), recipe(recipe_), replacements(replacements_) output(output_), recipe(recipe_), replacements(replacements_)
{ {
if (hasGroupItem(recipe)) if (hasGroupItem(recipe))
priority = SHAPELESS_AND_GROUPS; priority = PRIORITY_SHAPELESS_AND_GROUPS;
else else
priority = SHAPELESS; priority = PRIORITY_SHAPELESS;
} }
std::string CraftDefinitionShapeless::getName() const std::string CraftDefinitionShapeless::getName() const
@ -588,7 +588,7 @@ std::string CraftDefinitionShapeless::dump() const
CraftDefinitionToolRepair::CraftDefinitionToolRepair(float additional_wear_): CraftDefinitionToolRepair::CraftDefinitionToolRepair(float additional_wear_):
additional_wear(additional_wear_) additional_wear(additional_wear_)
{ {
priority = TOOLREPAIR; priority = PRIORITY_TOOLREPAIR;
} }
static ItemStack craftToolRepair( static ItemStack craftToolRepair(
@ -693,9 +693,9 @@ CraftDefinitionCooking::CraftDefinitionCooking(
output(output_), recipe(recipe_), cooktime(cooktime_), replacements(replacements_) output(output_), recipe(recipe_), cooktime(cooktime_), replacements(replacements_)
{ {
if (isGroupRecipeStr(recipe)) if (isGroupRecipeStr(recipe))
priority = SHAPELESS_AND_GROUPS; priority = PRIORITY_SHAPELESS_AND_GROUPS;
else else
priority = SHAPELESS; priority = PRIORITY_SHAPELESS;
} }
std::string CraftDefinitionCooking::getName() const std::string CraftDefinitionCooking::getName() const
@ -795,9 +795,9 @@ CraftDefinitionFuel::CraftDefinitionFuel(
recipe(recipe_), burntime(burntime_), replacements(replacements_) recipe(recipe_), burntime(burntime_), replacements(replacements_)
{ {
if (isGroupRecipeStr(recipe_name)) if (isGroupRecipeStr(recipe_name))
priority = SHAPELESS_AND_GROUPS; priority = PRIORITY_SHAPELESS_AND_GROUPS;
else else
priority = SHAPELESS; priority = PRIORITY_SHAPELESS;
} }
std::string CraftDefinitionFuel::getName() const std::string CraftDefinitionFuel::getName() const
@ -927,7 +927,7 @@ public:
// Try hash types with increasing collision rate // Try hash types with increasing collision rate
// while remembering the latest, highest priority recipe. // while remembering the latest, highest priority recipe.
CraftDefinition::RecipePriority priority_best = CraftDefinition::RecipePriority priority_best =
CraftDefinition::NO_RECIPE; CraftDefinition::PRIORITY_NO_RECIPE;
CraftDefinition *def_best = nullptr; CraftDefinition *def_best = nullptr;
for (int type = 0; type <= craft_hash_type_max; type++) { for (int type = 0; type <= craft_hash_type_max; type++) {
u64 hash = getHashForGrid((CraftHashType) type, input_names); u64 hash = getHashForGrid((CraftHashType) type, input_names);
@ -970,7 +970,7 @@ public:
} }
} }
} }
if (priority_best == CraftDefinition::NO_RECIPE) if (priority_best == CraftDefinition::PRIORITY_NO_RECIPE)
return false; return false;
if (decrementInput) if (decrementInput)
def_best->decrementInput(input, output_replacement, gamedef); def_best->decrementInput(input, output_replacement, gamedef);

12
src/craftdef.h
View File

@ -141,12 +141,12 @@ public:
*/ */
enum RecipePriority enum RecipePriority
{ {
NO_RECIPE, PRIORITY_NO_RECIPE,
TOOLREPAIR, PRIORITY_TOOLREPAIR,
SHAPELESS_AND_GROUPS, PRIORITY_SHAPELESS_AND_GROUPS,
SHAPELESS, PRIORITY_SHAPELESS,
SHAPED_AND_GROUPS, PRIORITY_SHAPED_AND_GROUPS,
SHAPED, PRIORITY_SHAPED,
}; };
CraftDefinition() = default; CraftDefinition() = default;