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));
+ for (std::vector<std::string>::size_type i = 0;
+ i < itemstrings.size(); i++) {
+ result.push_back(craftGetItemName(itemstrings[i], 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);
+ for (std::vector<ItemStack>::size_type i = 0;
+ i < items.size(); i++) {
+ result.push_back(items[i].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,
+ for (std::vector<std::string>::size_type i = 0;
+ i < items.size(); i++) {
+ result.push_back(ItemStack(std::string(items[i]), (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 (std::vector<std::string>::size_type i = 0;
+ i < items.size(); i++) {
// Is this an actual item?
- if (*it != "") {
+ if (items[i] != "") {
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 (std::vector<ItemStack>::size_type i = 0;
+ i < input.items.size(); i++) {
+ if (input.items[i].count != 0)
+ input.items[i].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 (std::vector<ItemStack>::size_type i = 0;
+ i < input.items.size(); i++) {
+ ItemStack &item = input.items[i];
+ // 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 (inputItemMatchesRecipe(item.name, j->first, gamedef->idef())) {
+ if (item.count == 1) {
+ item.deSerialize(j->second, gamedef->idef());
found_replacement = true;
pairs.erase(j);
break;
+ } else {
+ 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 (std::vector<std::pair<std::string, std::string> >::size_type i = 0;
+ i < pairs.size(); i++) {
+ const std::pair<std::string, std::string> &repl_p = pairs[i];
+ os << sep
+ << '"' << (repl_p.first)
+ << "\"=>\"" << (repl_p.second) << '"';
sep = ",";
}
os << "}";
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);
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
CraftHashType CraftDefinitionShaped::getHashType() 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 (std::vector<ItemStack>::size_type i = 0;
+ i < input.items.size(); i++) {
+ const ItemStack &item = input.items[i];
+ if (item.name != "")
+ 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
+void CraftDefinitionShapeless::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
CraftHashType CraftDefinitionShapeless::getHashType() const
ItemStack item1;
ItemStack item2;
- for (std::vector<ItemStack>::const_iterator
- it = input.items.begin();
- it != input.items.end(); it++) {
- if (!it->empty()) {
+ for (std::vector<ItemStack>::size_type i = 0;
+ i < input.items.size(); i++) {
+ const ItemStack &item = input.items[i];
+ 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 (std::vector<ItemStack>::size_type i = 0;
+ i < input.items.size(); i++) {
+ const ItemStack &item = input.items[i];
+ 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);
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 (std::vector<ItemStack>::size_type i = 0;
+ i < input.items.size(); i++) {
+ const std::string &name = input.items[i].name;
+ if (name != "")
+ 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);
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
CraftHashType CraftDefinitionCooking::getHashType() 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 (std::vector<ItemStack>::size_type i = 0;
+ i < input.items.size(); i++) {
+ const std::string &name = input.items[i].name;
+ if (name != "")
+ 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);
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
CraftHashType CraftDefinitionFuel::getHashType() const
}
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 (std::vector<ItemStack>::size_type i = 0;
+ i < input.items.size(); i++) {
+ if (!input.items[i].empty()) {
all_empty = false;
break;
}
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;*/
// Get output, then decrement input (if requested)
output = def->getOutput(input, gamedef);
if (decrementInput)
- def->decrementInput(input, gamedef);
+ def->decrementInput(input, output_replacement, gamedef);
/*errorstream << "Check RETURNS TRUE" << std::endl;*/
return true;
}
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;
{
std::ostringstream os(std::ios::binary);
os << "Crafting definitions:\n";
- for (int type = 0; type <= craft_hash_type_max; type++) {
+ 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";
+ 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 (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++) {
+ it != m_craft_defs[type].end(); ++it) {
for (std::vector<CraftDefinition*>::iterator
- iit = it->second.begin(); iit != it->second.end(); iit++) {
+ iit = it->second.begin();
+ iit != it->second.end(); ++iit) {
delete *iit;
}
it->second.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 (std::vector<CraftDefinition*>::size_type i = 0;
+ i < unhashed.size(); i++) {
+ CraftDefinition *def = unhashed[i];
// Initialize and get the definition's hash
def->initHash(gamedef);
// 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
projects / minetest.git / blobdiff