#include "util/serialize.h"
#include "util/string.h"
#include "util/numeric.h"
-#include "strfnd.h"
+#include "util/strfnd.h"
#include "exceptions.h"
inline bool isGroupRecipeStr(const std::string &rec_name)
case CRAFT_HASH_TYPE_ITEM_NAMES: {
std::ostringstream os;
bool is_first = true;
- for (size_t i = 0; i < grid_names.size(); i++) {
- if (grid_names[i] != "") {
- os << (is_first ? "" : "\n") << grid_names[i];
+ for (const std::string &grid_name : grid_names) {
+ if (!grid_name.empty()) {
+ os << (is_first ? "" : "\n") << grid_name;
is_first = false;
}
}
return getHashForString(os.str());
} case CRAFT_HASH_TYPE_COUNT: {
u64 cnt = 0;
- for (size_t i = 0; i < grid_names.size(); i++)
- if (grid_names[i] != "")
+ for (const std::string &grid_name : grid_names)
+ if (!grid_name.empty())
cnt++;
return cnt;
} case CRAFT_HASH_TYPE_UNHASHED:
}
// invalid CraftHashType
assert(false);
+ return 0;
}
// Check if input matches recipe
all_groups_match = false;
break;
}
- } while (!f.atend());
+ } while (!f.at_end());
if (all_groups_match)
return true;
}
const std::vector<std::string> &itemstrings, IGameDef *gamedef)
{
std::vector<std::string> result;
- for (std::vector<std::string>::const_iterator
- it = itemstrings.begin();
- it != itemstrings.end(); it++) {
- result.push_back(craftGetItemName(*it, gamedef));
+ result.reserve(itemstrings.size());
+ for (const auto &itemstring : itemstrings) {
+ result.push_back(craftGetItemName(itemstring, gamedef));
}
return result;
}
const std::vector<ItemStack> &items, IGameDef *gamedef)
{
std::vector<std::string> result;
- for (std::vector<ItemStack>::const_iterator
- it = items.begin();
- it != items.end(); it++) {
- result.push_back(it->name);
+ result.reserve(items.size());
+ for (const auto &item : items) {
+ result.push_back(item.name);
}
return result;
}
const std::vector<std::string> &items, IGameDef *gamedef)
{
std::vector<ItemStack> result;
- for (std::vector<std::string>::const_iterator
- it = items.begin();
- it != items.end(); it++) {
- result.push_back(ItemStack(std::string(*it), (u16)1,
- (u16)0, "", gamedef->getItemDefManager()));
+ result.reserve(items.size());
+ for (const auto &item : items) {
+ result.emplace_back(std::string(item), (u16)1,
+ (u16)0, gamedef->getItemDefManager());
}
return result;
}
bool success = false;
unsigned int x = 0;
unsigned int y = 0;
- for (std::vector<std::string>::const_iterator
- it = items.begin();
- it != items.end(); it++) {
+ for (const std::string &item : items) {
// Is this an actual item?
- if (*it != "") {
+ if (!item.empty()) {
if (!success) {
// This is the first nonempty item
min_x = max_x = x;
// Removes 1 from each item stack
static void craftDecrementInput(CraftInput &input, IGameDef *gamedef)
{
- for (std::vector<ItemStack>::iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (it->count != 0)
- it->remove(1);
+ for (auto &item : input.items) {
+ if (item.count != 0)
+ item.remove(1);
}
}
// Example: if replacements contains the pair ("bucket:bucket_water", "bucket:bucket_empty"),
// a water bucket will not be removed but replaced by an empty bucket.
static void craftDecrementOrReplaceInput(CraftInput &input,
+ std::vector<ItemStack> &output_replacements,
const CraftReplacements &replacements,
IGameDef *gamedef)
{
// Make a copy of the replacements pair list
std::vector<std::pair<std::string, std::string> > pairs = replacements.pairs;
- for (std::vector<ItemStack>::iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (it->count == 1) {
- // Find an appropriate replacement
- bool found_replacement = false;
- for (std::vector<std::pair<std::string, std::string> >::iterator
- j = pairs.begin();
- j != pairs.end(); j++) {
- if (it->name == craftGetItemName(j->first, gamedef)) {
- it->deSerialize(j->second, gamedef->idef());
+ for (auto &item : input.items) {
+ // Find an appropriate replacement
+ bool found_replacement = false;
+ for (auto j = pairs.begin(); j != pairs.end(); ++j) {
+ if (inputItemMatchesRecipe(item.name, j->first, gamedef->idef())) {
+ if (item.count == 1) {
+ item.deSerialize(j->second, gamedef->idef());
found_replacement = true;
pairs.erase(j);
break;
}
+
+ ItemStack rep;
+ rep.deSerialize(j->second, gamedef->idef());
+ item.remove(1);
+ found_replacement = true;
+ output_replacements.push_back(rep);
+ break;
+
}
- // No replacement was found, simply decrement count to zero
- if (!found_replacement)
- it->remove(1);
- } else if (it->count >= 2) {
- // Ignore replacements for items with count >= 2
- it->remove(1);
}
+ // No replacement was found, simply decrement count by one
+ if (!found_replacement && item.count > 0)
+ item.remove(1);
}
}
unsigned int width)
{
std::ostringstream os(std::ios::binary);
- os<<"{ ";
+ os << "{ ";
unsigned int x = 0;
- for(std::vector<std::string>::const_iterator
- it = items.begin();
- it != items.end(); it++, x++) {
+ for(std::vector<std::string>::size_type i = 0;
+ i < items.size(); i++, x++) {
if (x == width) {
- os<<"; ";
+ os << "; ";
x = 0;
} else if (x != 0) {
- os<<",";
+ os << ",";
}
- os << '"' << (*it) << '"';
+ os << '"' << items[i] << '"';
}
os << " }";
return os.str();
std::ostringstream os(std::ios::binary);
os << "{ ";
unsigned int x = 0;
- for (std::vector<ItemStack>::const_iterator
- it = items.begin();
- it != items.end(); it++, x++) {
+ for (std::vector<ItemStack>::size_type i = 0;
+ i < items.size(); i++, x++) {
if (x == width) {
os << "; ";
x = 0;
} else if (x != 0) {
- os<<",";
+ os << ",";
}
- os << '"' << (it->getItemString()) << '"';
+ os << '"' << (items[i].getItemString()) << '"';
}
os << " }";
return os.str();
std::ostringstream os(std::ios::binary);
os<<"{";
const char *sep = "";
- for (std::vector<std::pair<std::string, std::string> >::const_iterator
- it = pairs.begin();
- it != pairs.end(); it++) {
- os << sep << '"' << (it->first) << "\"=>\"" << (it->second) << '"';
+ for (const auto &repl_p : pairs) {
+ os << sep
+ << '"' << (repl_p.first)
+ << "\"=>\"" << (repl_p.second) << '"';
sep = ",";
}
os << "}";
if (inp_width == 0)
return false;
while (inp_names.size() % inp_width != 0)
- inp_names.push_back("");
+ inp_names.emplace_back("");
// Get input bounds
unsigned int inp_min_x = 0, inp_max_x = 0, inp_min_y = 0, inp_max_y = 0;
if (rec_width == 0)
return false;
while (rec_names.size() % rec_width != 0)
- rec_names.push_back("");
+ rec_names.emplace_back("");
// Get recipe bounds
unsigned int rec_min_x=0, rec_max_x=0, rec_min_y=0, rec_max_y=0;
return CraftInput(CRAFT_METHOD_NORMAL,width,craftGetItems(recipe,gamedef));
}
-void CraftDefinitionShaped::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionShaped::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
-}
-
-CraftHashType CraftDefinitionShaped::getHashType() const
-{
- assert(hash_inited); // Pre-condition
- bool has_group = false;
- for (size_t i = 0; i < recipe_names.size(); i++) {
- if (isGroupRecipeStr(recipe_names[i])) {
- has_group = true;
- break;
- }
- }
- if (has_group)
- return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
u64 CraftDefinitionShaped::getHash(CraftHashType type) const
return;
hash_inited = true;
recipe_names = craftGetItemNames(recipe, gamedef);
+
+ bool has_group = false;
+ for (const auto &recipe_name : recipe_names) {
+ if (isGroupRecipeStr(recipe_name)) {
+ has_group = true;
+ break;
+ }
+ }
+ if (has_group) {
+ hash_type = CRAFT_HASH_TYPE_COUNT;
+ priority = SHAPED_AND_GROUPS;
+ } else {
+ hash_type = CRAFT_HASH_TYPE_ITEM_NAMES;
+ priority = SHAPED;
+ }
}
std::string CraftDefinitionShaped::dump() const
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for (std::vector<ItemStack>::const_iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (it->name != "")
- input_filtered.push_back(it->name);
+ for (const auto &item : input.items) {
+ if (!item.name.empty())
+ input_filtered.push_back(item.name);
}
// If there is a wrong number of items in input, no match
return CraftInput(CRAFT_METHOD_NORMAL, 0, craftGetItems(recipe, gamedef));
}
-void CraftDefinitionShapeless::decrementInput(CraftInput &input, IGameDef *gamedef) const
-{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
-}
-
-CraftHashType CraftDefinitionShapeless::getHashType() const
+void CraftDefinitionShapeless::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- assert(hash_inited); // Pre-condition
- bool has_group = false;
- for (size_t i = 0; i < recipe_names.size(); i++) {
- if (isGroupRecipeStr(recipe_names[i])) {
- has_group = true;
- break;
- }
- }
- if (has_group)
- return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
u64 CraftDefinitionShapeless::getHash(CraftHashType type) const
hash_inited = true;
recipe_names = craftGetItemNames(recipe, gamedef);
std::sort(recipe_names.begin(), recipe_names.end());
+
+ bool has_group = false;
+ for (const auto &recipe_name : recipe_names) {
+ if (isGroupRecipeStr(recipe_name)) {
+ has_group = true;
+ break;
+ }
+ }
+ if (has_group) {
+ hash_type = CRAFT_HASH_TYPE_COUNT;
+ priority = SHAPELESS_AND_GROUPS;
+ } else {
+ hash_type = CRAFT_HASH_TYPE_ITEM_NAMES;
+ priority = SHAPELESS;
+ }
}
std::string CraftDefinitionShapeless::dump() const
IItemDefManager *idef = gamedef->idef();
if (item1.count != 1 || item2.count != 1 || item1.name != item2.name
|| idef->get(item1.name).type != ITEM_TOOL
- || idef->get(item2.name).type != ITEM_TOOL) {
+ || itemgroup_get(idef->get(item1.name).groups, "disable_repair") == 1) {
// Failure
return ItemStack();
}
ItemStack item1;
ItemStack item2;
- for (std::vector<ItemStack>::const_iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (!it->empty()) {
+ for (const auto &item : input.items) {
+ if (!item.empty()) {
if (item1.empty())
- item1 = *it;
+ item1 = item;
else if (item2.empty())
- item2 = *it;
+ item2 = item;
else
return false;
}
{
ItemStack item1;
ItemStack item2;
- for (std::vector<ItemStack>::const_iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (!it->empty()) {
+ for (const auto &item : input.items) {
+ if (!item.empty()) {
if (item1.empty())
- item1 = *it;
+ item1 = item;
else if (item2.empty())
- item2 = *it;
+ item2 = item;
}
}
ItemStack repaired = craftToolRepair(item1, item2, additional_wear, gamedef);
CraftInput CraftDefinitionToolRepair::getInput(const CraftOutput &output, IGameDef *gamedef) const
{
std::vector<ItemStack> stack;
- stack.push_back(ItemStack());
+ stack.emplace_back();
return CraftInput(CRAFT_METHOD_COOKING, additional_wear, stack);
}
-void CraftDefinitionToolRepair::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionToolRepair::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
craftDecrementInput(input, gamedef);
}
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for (std::vector<ItemStack>::const_iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (it->name != "")
- input_filtered.push_back(it->name);
+ for (const auto &item : input.items) {
+ const std::string &name = item.name;
+ if (!name.empty())
+ input_filtered.push_back(name);
}
// If there is a wrong number of items in input, no match
return CraftInput(CRAFT_METHOD_COOKING,cooktime,craftGetItems(rec,gamedef));
}
-void CraftDefinitionCooking::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionCooking::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
-}
-
-CraftHashType CraftDefinitionCooking::getHashType() const
-{
- if (isGroupRecipeStr(recipe_name))
- return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
u64 CraftDefinitionCooking::getHash(CraftHashType type) const
{
if (type == CRAFT_HASH_TYPE_ITEM_NAMES) {
return getHashForString(recipe_name);
- } else if (type == CRAFT_HASH_TYPE_COUNT) {
+ }
+
+ if (type == CRAFT_HASH_TYPE_COUNT) {
return 1;
- } else {
- //illegal hash type for this CraftDefinition (pre-condition)
- assert(false);
- return 0;
}
+
+ // illegal hash type for this CraftDefinition (pre-condition)
+ assert(false);
+ return 0;
}
void CraftDefinitionCooking::initHash(IGameDef *gamedef)
return;
hash_inited = true;
recipe_name = craftGetItemName(recipe, gamedef);
+
+ if (isGroupRecipeStr(recipe_name)) {
+ hash_type = CRAFT_HASH_TYPE_COUNT;
+ priority = SHAPELESS_AND_GROUPS;
+ } else {
+ hash_type = CRAFT_HASH_TYPE_ITEM_NAMES;
+ priority = SHAPELESS;
+ }
}
std::string CraftDefinitionCooking::dump() const
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for (std::vector<ItemStack>::const_iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (it->name != "")
- input_filtered.push_back(it->name);
+ for (const auto &item : input.items) {
+ const std::string &name = item.name;
+ if (!name.empty())
+ input_filtered.push_back(name);
}
// If there is a wrong number of items in input, no match
return CraftInput(CRAFT_METHOD_COOKING,(int)burntime,craftGetItems(rec,gamedef));
}
-void CraftDefinitionFuel::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionFuel::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
-}
-
-CraftHashType CraftDefinitionFuel::getHashType() const
-{
- if (isGroupRecipeStr(recipe_name))
- return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
u64 CraftDefinitionFuel::getHash(CraftHashType type) const
{
if (type == CRAFT_HASH_TYPE_ITEM_NAMES) {
return getHashForString(recipe_name);
- } else if (type == CRAFT_HASH_TYPE_COUNT) {
+ }
+
+ if (type == CRAFT_HASH_TYPE_COUNT) {
return 1;
- } else {
- //illegal hash type for this CraftDefinition (pre-condition)
- assert(false);
- return 0;
}
+
+ // illegal hash type for this CraftDefinition (pre-condition)
+ assert(false);
+ return 0;
}
void CraftDefinitionFuel::initHash(IGameDef *gamedef)
return;
hash_inited = true;
recipe_name = craftGetItemName(recipe, gamedef);
+
+ if (isGroupRecipeStr(recipe_name)) {
+ hash_type = CRAFT_HASH_TYPE_COUNT;
+ priority = SHAPELESS_AND_GROUPS;
+ } else {
+ hash_type = CRAFT_HASH_TYPE_ITEM_NAMES;
+ priority = SHAPELESS;
+ }
}
+
std::string CraftDefinitionFuel::dump() const
{
std::ostringstream os(std::ios::binary);
}
virtual bool getCraftResult(CraftInput &input, CraftOutput &output,
- bool decrementInput, IGameDef *gamedef) const
+ std::vector<ItemStack> &output_replacement, bool decrementInput,
+ IGameDef *gamedef) const
{
output.item = "";
output.time = 0;
// If all input items are empty, abort.
bool all_empty = true;
- for (std::vector<ItemStack>::const_iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (!it->empty()) {
+ for (const auto &item : input.items) {
+ if (!item.empty()) {
all_empty = false;
break;
}
input_names = craftGetItemNames(input.items, gamedef);
std::sort(input_names.begin(), input_names.end());
- // Try hash types with increasing collision rate, and return if found.
+ // Try hash types with increasing collision rate
+ // while remembering the latest, highest priority recipe.
+ CraftDefinition::RecipePriority priority_best =
+ CraftDefinition::NO_RECIPE;
+ CraftDefinition *def_best = nullptr;
for (int type = 0; type <= craft_hash_type_max; type++) {
u64 hash = getHashForGrid((CraftHashType) type, input_names);
// We'd like to do "const [...] hash_collisions = m_craft_defs[type][hash];"
// but that doesn't compile for some reason. This does.
- std::map<u64, std::vector<CraftDefinition*> >::const_iterator
- col_iter = (m_craft_defs[type]).find(hash);
+ auto col_iter = (m_craft_defs[type]).find(hash);
if (col_iter == (m_craft_defs[type]).end())
continue;
const std::vector<CraftDefinition*> &hash_collisions = col_iter->second;
// Walk crafting definitions from back to front, so that later
// definitions can override earlier ones.
- for (std::vector<CraftDefinition*>::const_reverse_iterator
- it = hash_collisions.rbegin();
- it != hash_collisions.rend(); it++) {
- CraftDefinition *def = *it;
+ for (std::vector<CraftDefinition*>::size_type
+ i = hash_collisions.size(); i > 0; i--) {
+ CraftDefinition *def = hash_collisions[i - 1];
/*errorstream << "Checking " << input.dump() << std::endl
<< " against " << def->dump() << std::endl;*/
- if (def->check(input, gamedef)) {
- // Get output, then decrement input (if requested)
- output = def->getOutput(input, gamedef);
- if (decrementInput)
- def->decrementInput(input, gamedef);
- /*errorstream << "Check RETURNS TRUE" << std::endl;*/
- return true;
+ CraftDefinition::RecipePriority priority = def->getPriority();
+ if (priority > priority_best
+ && def->check(input, gamedef)) {
+ // Check if the crafted node/item exists
+ CraftOutput out = def->getOutput(input, gamedef);
+ ItemStack is;
+ is.deSerialize(out.item, gamedef->idef());
+ if (!is.isKnown(gamedef->idef())) {
+ infostream << "trying to craft non-existent "
+ << out.item << ", ignoring recipe" << std::endl;
+ continue;
+ }
+
+ output = out;
+ priority_best = priority;
+ def_best = def;
}
}
}
- return false;
+ if (priority_best == CraftDefinition::NO_RECIPE)
+ return false;
+ if (decrementInput)
+ def_best->decrementInput(input, output_replacement, gamedef);
+ return true;
}
virtual std::vector<CraftDefinition*> getCraftRecipes(CraftOutput &output,
{
std::vector<CraftDefinition*> recipes;
- std::map<std::string, std::vector<CraftDefinition*> >::const_iterator
- vec_iter = m_output_craft_definitions.find(output.item);
+ auto vec_iter = m_output_craft_definitions.find(output.item);
if (vec_iter == m_output_craft_definitions.end())
return recipes;
recipes.reserve(limit ? MYMIN(limit, vec.size()) : vec.size());
- for (std::vector<CraftDefinition*>::const_reverse_iterator
- it = vec.rbegin(); it != vec.rend(); ++it) {
+ for (std::vector<CraftDefinition*>::size_type i = vec.size();
+ i > 0; i--) {
+ CraftDefinition *def = vec[i - 1];
if (limit && recipes.size() >= limit)
break;
- recipes.push_back(*it);
+ recipes.push_back(def);
}
return recipes;
}
+
+ virtual bool clearCraftRecipesByOutput(const CraftOutput &output, IGameDef *gamedef)
+ {
+ auto vec_iter = m_output_craft_definitions.find(output.item);
+
+ if (vec_iter == m_output_craft_definitions.end())
+ return false;
+
+ std::vector<CraftDefinition*> &vec = vec_iter->second;
+ for (auto def : vec) {
+ // Recipes are not yet hashed at this point
+ std::vector<CraftDefinition*> &unhashed_inputs_vec = m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
+ std::vector<CraftDefinition*> new_vec_by_input;
+ /* We will preallocate necessary memory addresses, so we don't need to reallocate them later.
+ This would save us some performance. */
+ new_vec_by_input.reserve(unhashed_inputs_vec.size());
+ for (auto &i2 : unhashed_inputs_vec) {
+ if (def != i2) {
+ new_vec_by_input.push_back(i2);
+ }
+ }
+ m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].swap(new_vec_by_input);
+ }
+ m_output_craft_definitions.erase(output.item);
+ return true;
+ }
+
+ virtual bool clearCraftRecipesByInput(CraftMethod craft_method, unsigned int craft_grid_width,
+ const std::vector<std::string> &recipe, IGameDef *gamedef)
+ {
+ bool all_empty = true;
+ for (const auto &i : recipe) {
+ if (!i.empty()) {
+ all_empty = false;
+ break;
+ }
+ }
+ if (all_empty)
+ return false;
+
+ CraftInput input(craft_method, craft_grid_width, craftGetItems(recipe, gamedef));
+ // Recipes are not yet hashed at this point
+ std::vector<CraftDefinition*> &unhashed_inputs_vec = m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
+ std::vector<CraftDefinition*> new_vec_by_input;
+ bool got_hit = false;
+ for (std::vector<CraftDefinition*>::size_type
+ i = unhashed_inputs_vec.size(); i > 0; i--) {
+ CraftDefinition *def = unhashed_inputs_vec[i - 1];
+ /* If the input doesn't match the recipe definition, this recipe definition later
+ will be added back in source map. */
+ if (!def->check(input, gamedef)) {
+ new_vec_by_input.push_back(def);
+ continue;
+ }
+ CraftOutput output = def->getOutput(input, gamedef);
+ got_hit = true;
+ auto vec_iter = m_output_craft_definitions.find(output.item);
+ if (vec_iter == m_output_craft_definitions.end())
+ continue;
+ std::vector<CraftDefinition*> &vec = vec_iter->second;
+ std::vector<CraftDefinition*> new_vec_by_output;
+ /* We will preallocate necessary memory addresses, so we don't need
+ to reallocate them later. This would save us some performance. */
+ new_vec_by_output.reserve(vec.size());
+ for (auto &vec_i : vec) {
+ /* If pointers from map by input and output are not same,
+ we will add 'CraftDefinition*' to a new vector. */
+ if (def != vec_i) {
+ /* Adding dereferenced iterator value (which are
+ 'CraftDefinition' reference) to a new vector. */
+ new_vec_by_output.push_back(vec_i);
+ }
+ }
+ // Swaps assigned to current key value with new vector for output map.
+ m_output_craft_definitions[output.item].swap(new_vec_by_output);
+ }
+ if (got_hit)
+ // Swaps value with new vector for input map.
+ m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].swap(new_vec_by_input);
+
+ return got_hit;
+ }
+
virtual std::string dump() const
{
std::ostringstream os(std::ios::binary);
os << "Crafting definitions:\n";
- for (int type = 0; type <= craft_hash_type_max; type++) {
- for (std::map<u64, std::vector<CraftDefinition*> >::const_iterator
- it = (m_craft_defs[type]).begin();
- it != (m_craft_defs[type]).end(); it++) {
- for (std::vector<CraftDefinition*>::const_iterator
- iit = it->second.begin(); iit != it->second.end(); iit++) {
- os << "type " << type << " hash " << it->first << (*iit)->dump() << "\n";
+ for (int type = 0; type <= craft_hash_type_max; ++type) {
+ for (auto it = m_craft_defs[type].begin();
+ it != m_craft_defs[type].end(); ++it) {
+ for (std::vector<CraftDefinition*>::size_type i = 0;
+ i < it->second.size(); i++) {
+ os << "type " << type
+ << " hash " << it->first
+ << " def " << it->second[i]->dump()
+ << "\n";
}
}
}
}
virtual void clear()
{
- for (int type = 0; type <= craft_hash_type_max; type++) {
- for (std::map<u64, std::vector<CraftDefinition*> >::iterator
- it = m_craft_defs[type].begin();
- it != m_craft_defs[type].end(); it++) {
- for (std::vector<CraftDefinition*>::iterator
- iit = it->second.begin(); iit != it->second.end(); iit++) {
- delete *iit;
+ for (int type = 0; type <= craft_hash_type_max; ++type) {
+ for (auto &it : m_craft_defs[type]) {
+ for (auto &iit : it.second) {
+ delete iit;
}
- it->second.clear();
+ it.second.clear();
}
m_craft_defs[type].clear();
}
virtual void initHashes(IGameDef *gamedef)
{
// Move the CraftDefs from the unhashed layer into layers higher up.
- for (std::vector<CraftDefinition*>::iterator
- it = (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).begin();
- it != (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).end(); it++) {
- CraftDefinition *def = *it;
-
+ std::vector<CraftDefinition *> &unhashed =
+ m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
+ for (auto def : unhashed) {
// Initialize and get the definition's hash
def->initHash(gamedef);
CraftHashType type = def->getHashType();
// Enter the definition
m_craft_defs[type][hash].push_back(def);
}
- m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].clear();
+ unhashed.clear();
}
private:
- //TODO: change both maps to unordered_map when c++11 can be used
- std::vector<std::map<u64, std::vector<CraftDefinition*> > > m_craft_defs;
- std::map<std::string, std::vector<CraftDefinition*> > m_output_craft_definitions;
+ std::vector<std::unordered_map<u64, std::vector<CraftDefinition*> > >
+ m_craft_defs;
+ std::unordered_map<std::string, std::vector<CraftDefinition*> >
+ m_output_craft_definitions;
};
IWritableCraftDefManager* createCraftDefManager()
{
return new CCraftDefManager();
}
-
projects / oweals / minetest.git / blobdiff