Craftdef refactor
Fix style, refactor assert, use '"' instead of "\"", replace code duplicating craftGetItemName, rename iterators.master
est31
parent
7220ca906d
commit
4f851faa91
275
src/craftdef.cpp
275
src/craftdef.cpp
|
|
@ -39,7 +39,7 @@ inline bool isGroupRecipeStr(const std::string &rec_name)
|
|||
|
||||
inline u64 getHashForString(const std::string &recipe_str)
|
||||
{
|
||||
/*errorstream << "Hashing craft string \"" << recipe_str << "\"";*/
|
||||
/*errorstream << "Hashing craft string \"" << recipe_str << '"';*/
|
||||
return murmur_hash_64_ua(recipe_str.data(), recipe_str.length(), 0xdeadbeef);
|
||||
}
|
||||
|
||||
|
|
@ -112,10 +112,9 @@ static std::vector<std::string> craftGetItemNames(
|
|||
{
|
||||
std::vector<std::string> result;
|
||||
for (std::vector<std::string>::const_iterator
|
||||
i = itemstrings.begin();
|
||||
i != itemstrings.end(); i++)
|
||||
{
|
||||
result.push_back(craftGetItemName(*i, gamedef));
|
||||
it = itemstrings.begin();
|
||||
it != itemstrings.end(); it++) {
|
||||
result.push_back(craftGetItemName(*it, gamedef));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -126,10 +125,9 @@ static std::vector<std::string> craftGetItemNames(
|
|||
{
|
||||
std::vector<std::string> result;
|
||||
for (std::vector<ItemStack>::const_iterator
|
||||
i = items.begin();
|
||||
i != items.end(); i++)
|
||||
{
|
||||
result.push_back(i->name);
|
||||
it = items.begin();
|
||||
it != items.end(); it++) {
|
||||
result.push_back(it->name);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -140,10 +138,10 @@ static std::vector<ItemStack> craftGetItems(
|
|||
{
|
||||
std::vector<ItemStack> result;
|
||||
for (std::vector<std::string>::const_iterator
|
||||
i = items.begin();
|
||||
i != items.end(); i++)
|
||||
{
|
||||
result.push_back(ItemStack(std::string(*i),(u16)1,(u16)0,"",gamedef->getItemDefManager()));
|
||||
it = items.begin();
|
||||
it != items.end(); it++) {
|
||||
result.push_back(ItemStack(std::string(*it), (u16)1,
|
||||
(u16)0, "", gamedef->getItemDefManager()));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -158,20 +156,16 @@ static bool craftGetBounds(const std::vector<std::string> &items, unsigned int w
|
|||
unsigned int x = 0;
|
||||
unsigned int y = 0;
|
||||
for (std::vector<std::string>::const_iterator
|
||||
i = items.begin();
|
||||
i != items.end(); i++)
|
||||
{
|
||||
if(*i != "") // Is this an actual item?
|
||||
{
|
||||
if(!success)
|
||||
{
|
||||
it = items.begin();
|
||||
it != items.end(); it++) {
|
||||
// Is this an actual item?
|
||||
if (*it != "") {
|
||||
if (!success) {
|
||||
// This is the first nonempty item
|
||||
min_x = max_x = x;
|
||||
min_y = max_y = y;
|
||||
success = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
if (x < min_x) min_x = x;
|
||||
if (x > max_x) max_x = x;
|
||||
if (y < min_y) min_y = y;
|
||||
|
|
@ -181,8 +175,7 @@ static bool craftGetBounds(const std::vector<std::string> &items, unsigned int w
|
|||
|
||||
// Step coordinate
|
||||
x++;
|
||||
if(x == width)
|
||||
{
|
||||
if (x == width) {
|
||||
x = 0;
|
||||
y++;
|
||||
}
|
||||
|
|
@ -194,11 +187,10 @@ static bool craftGetBounds(const std::vector<std::string> &items, unsigned int w
|
|||
static void craftDecrementInput(CraftInput &input, IGameDef *gamedef)
|
||||
{
|
||||
for (std::vector<ItemStack>::iterator
|
||||
i = input.items.begin();
|
||||
i != input.items.end(); i++)
|
||||
{
|
||||
if(i->count != 0)
|
||||
i->remove(1);
|
||||
it = input.items.begin();
|
||||
it != input.items.end(); it++) {
|
||||
if (it->count != 0)
|
||||
it->remove(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -209,8 +201,7 @@ static void craftDecrementOrReplaceInput(CraftInput &input,
|
|||
const CraftReplacements &replacements,
|
||||
IGameDef *gamedef)
|
||||
{
|
||||
if(replacements.pairs.empty())
|
||||
{
|
||||
if (replacements.pairs.empty()) {
|
||||
craftDecrementInput(input, gamedef);
|
||||
return;
|
||||
}
|
||||
|
|
@ -219,22 +210,16 @@ static void craftDecrementOrReplaceInput(CraftInput &input,
|
|||
std::vector<std::pair<std::string, std::string> > pairs = replacements.pairs;
|
||||
|
||||
for (std::vector<ItemStack>::iterator
|
||||
i = input.items.begin();
|
||||
i != input.items.end(); i++)
|
||||
{
|
||||
if(i->count == 1)
|
||||
{
|
||||
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++)
|
||||
{
|
||||
ItemStack from_item;
|
||||
from_item.deSerialize(j->first, gamedef->idef());
|
||||
if(i->name == from_item.name)
|
||||
{
|
||||
i->deSerialize(j->second, gamedef->idef());
|
||||
j != pairs.end(); j++) {
|
||||
if (it->name == craftGetItemName(j->first, gamedef)) {
|
||||
it->deSerialize(j->second, gamedef->idef());
|
||||
found_replacement = true;
|
||||
pairs.erase(j);
|
||||
break;
|
||||
|
|
@ -242,12 +227,10 @@ static void craftDecrementOrReplaceInput(CraftInput &input,
|
|||
}
|
||||
// No replacement was found, simply decrement count to zero
|
||||
if (!found_replacement)
|
||||
i->remove(1);
|
||||
}
|
||||
else if(i->count >= 2)
|
||||
{
|
||||
it->remove(1);
|
||||
} else if (it->count >= 2) {
|
||||
// Ignore replacements for items with count >= 2
|
||||
i->remove(1);
|
||||
it->remove(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -260,19 +243,15 @@ static std::string craftDumpMatrix(const std::vector<std::string> &items,
|
|||
os<<"{ ";
|
||||
unsigned int x = 0;
|
||||
for(std::vector<std::string>::const_iterator
|
||||
i = items.begin();
|
||||
i != items.end(); i++, x++)
|
||||
{
|
||||
if(x == width)
|
||||
{
|
||||
it = items.begin();
|
||||
it != items.end(); it++, x++) {
|
||||
if (x == width) {
|
||||
os<<"; ";
|
||||
x = 0;
|
||||
}
|
||||
else if(x != 0)
|
||||
{
|
||||
} else if (x != 0) {
|
||||
os<<",";
|
||||
}
|
||||
os<<"\""<<(*i)<<"\"";
|
||||
os << '"' << (*it) << '"';
|
||||
}
|
||||
os << " }";
|
||||
return os.str();
|
||||
|
|
@ -286,19 +265,15 @@ std::string craftDumpMatrix(const std::vector<ItemStack> &items,
|
|||
os << "{ ";
|
||||
unsigned int x = 0;
|
||||
for (std::vector<ItemStack>::const_iterator
|
||||
i = items.begin();
|
||||
i != items.end(); i++, x++)
|
||||
{
|
||||
if(x == width)
|
||||
{
|
||||
it = items.begin();
|
||||
it != items.end(); it++, x++) {
|
||||
if (x == width) {
|
||||
os << "; ";
|
||||
x = 0;
|
||||
}
|
||||
else if(x != 0)
|
||||
{
|
||||
} else if (x != 0) {
|
||||
os<<",";
|
||||
}
|
||||
os<<"\""<<(i->getItemString())<<"\"";
|
||||
os << '"' << (it->getItemString()) << '"';
|
||||
}
|
||||
os << " }";
|
||||
return os.str();
|
||||
|
|
@ -312,7 +287,8 @@ std::string craftDumpMatrix(const std::vector<ItemStack> &items,
|
|||
std::string CraftInput::dump() const
|
||||
{
|
||||
std::ostringstream os(std::ios::binary);
|
||||
os<<"(method="<<((int)method)<<", items="<<craftDumpMatrix(items, width)<<")";
|
||||
os << "(method=" << ((int)method) << ", items="
|
||||
<< craftDumpMatrix(items, width) << ")";
|
||||
return os.str();
|
||||
}
|
||||
|
||||
|
|
@ -337,10 +313,9 @@ std::string CraftReplacements::dump() const
|
|||
os<<"{";
|
||||
const char *sep = "";
|
||||
for (std::vector<std::pair<std::string, std::string> >::const_iterator
|
||||
i = pairs.begin();
|
||||
i != pairs.end(); i++)
|
||||
{
|
||||
os<<sep<<"\""<<(i->first)<<"\"=>\""<<(i->second)<<"\"";
|
||||
it = pairs.begin();
|
||||
it != pairs.end(); it++) {
|
||||
os << sep << '"' << (it->first) << "\"=>\"" << (it->second) << '"';
|
||||
sep = ",";
|
||||
}
|
||||
os << "}";
|
||||
|
|
@ -350,8 +325,7 @@ std::string CraftReplacements::dump() const
|
|||
void CraftReplacements::serialize(std::ostream &os) const
|
||||
{
|
||||
writeU16(os, pairs.size());
|
||||
for(u32 i=0; i<pairs.size(); i++)
|
||||
{
|
||||
for (u32 i=0; i<pairs.size(); i++) {
|
||||
os << serializeString(pairs[i].first);
|
||||
os << serializeString(pairs[i].second);
|
||||
}
|
||||
|
|
@ -361,8 +335,7 @@ void CraftReplacements::deSerialize(std::istream &is)
|
|||
{
|
||||
pairs.clear();
|
||||
u32 count = readU16(is);
|
||||
for(u32 i=0; i<count; i++)
|
||||
{
|
||||
for (u32 i=0; i<count; i++) {
|
||||
std::string first = deSerializeString(is);
|
||||
std::string second = deSerializeString(is);
|
||||
pairs.push_back(std::make_pair(first, second));
|
||||
|
|
@ -387,29 +360,19 @@ CraftDefinition* CraftDefinition::deSerialize(std::istream &is)
|
|||
"unsupported CraftDefinition version");
|
||||
std::string name = deSerializeString(is);
|
||||
CraftDefinition *def = NULL;
|
||||
if(name == "shaped")
|
||||
{
|
||||
if (name == "shaped") {
|
||||
def = new CraftDefinitionShaped;
|
||||
}
|
||||
else if(name == "shapeless")
|
||||
{
|
||||
} else if (name == "shapeless") {
|
||||
def = new CraftDefinitionShapeless;
|
||||
}
|
||||
else if(name == "toolrepair")
|
||||
{
|
||||
} else if (name == "toolrepair") {
|
||||
def = new CraftDefinitionToolRepair;
|
||||
}
|
||||
else if(name == "cooking")
|
||||
{
|
||||
} else if (name == "cooking") {
|
||||
def = new CraftDefinitionCooking;
|
||||
}
|
||||
else if(name == "fuel")
|
||||
{
|
||||
} else if (name == "fuel") {
|
||||
def = new CraftDefinitionFuel;
|
||||
}
|
||||
else
|
||||
{
|
||||
infostream<<"Unknown CraftDefinition name=\""<<name<<"\""<<std::endl;
|
||||
} else {
|
||||
infostream << "Unknown CraftDefinition name=\""
|
||||
<< name << '"' << std::endl;
|
||||
throw SerializationError("Unknown CraftDefinition name");
|
||||
}
|
||||
def->deSerializeBody(is, version);
|
||||
|
|
@ -440,7 +403,8 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co
|
|||
|
||||
// Get input bounds
|
||||
unsigned int inp_min_x = 0, inp_max_x = 0, inp_min_y = 0, inp_max_y = 0;
|
||||
if(!craftGetBounds(inp_names, inp_width, inp_min_x, inp_max_x, inp_min_y, inp_max_y))
|
||||
if (!craftGetBounds(inp_names, inp_width, inp_min_x, inp_max_x,
|
||||
inp_min_y, inp_max_y))
|
||||
return false; // it was empty
|
||||
|
||||
std::vector<std::string> rec_names;
|
||||
|
|
@ -458,7 +422,8 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co
|
|||
|
||||
// Get recipe bounds
|
||||
unsigned int rec_min_x=0, rec_max_x=0, rec_min_y=0, rec_max_y=0;
|
||||
if(!craftGetBounds(rec_names, rec_width, rec_min_x, rec_max_x, rec_min_y, rec_max_y))
|
||||
if (!craftGetBounds(rec_names, rec_width, rec_min_x, rec_max_x,
|
||||
rec_min_y, rec_max_y))
|
||||
return false; // it was empty
|
||||
|
||||
// Different sizes?
|
||||
|
|
@ -480,8 +445,7 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co
|
|||
|
||||
if (!inputItemMatchesRecipe(
|
||||
inp_names[inp_y + inp_x],
|
||||
rec_names[rec_y + rec_x], gamedef->idef())
|
||||
) {
|
||||
rec_names[rec_y + rec_x], gamedef->idef())) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -507,7 +471,7 @@ void CraftDefinitionShaped::decrementInput(CraftInput &input, IGameDef *gamedef)
|
|||
|
||||
CraftHashType CraftDefinitionShaped::getHashType() const
|
||||
{
|
||||
assert(hash_inited); //pre-condition
|
||||
assert(hash_inited); // Pre-condition
|
||||
bool has_group = false;
|
||||
for (size_t i = 0; i < recipe_names.size(); i++) {
|
||||
if (isGroupRecipeStr(recipe_names[i])) {
|
||||
|
|
@ -523,16 +487,13 @@ CraftHashType CraftDefinitionShaped::getHashType() const
|
|||
|
||||
u64 CraftDefinitionShaped::getHash(CraftHashType type) const
|
||||
{
|
||||
assert(hash_inited); //pre-condition
|
||||
if ((type == CRAFT_HASH_TYPE_ITEM_NAMES) || (type == CRAFT_HASH_TYPE_COUNT)) {
|
||||
assert(hash_inited); // Pre-condition
|
||||
assert((type == CRAFT_HASH_TYPE_ITEM_NAMES)
|
||||
|| (type == CRAFT_HASH_TYPE_COUNT)); // Pre-condition
|
||||
|
||||
std::vector<std::string> rec_names = recipe_names;
|
||||
std::sort(rec_names.begin(), rec_names.end());
|
||||
return getHashForGrid(type, rec_names);
|
||||
} else {
|
||||
//illegal hash type for this CraftDefinition (pre-condition)
|
||||
assert(false);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void CraftDefinitionShaped::initHash(IGameDef *gamedef)
|
||||
|
|
@ -592,11 +553,10 @@ bool CraftDefinitionShapeless::check(const CraftInput &input, IGameDef *gamedef)
|
|||
// Filter empty items out of input
|
||||
std::vector<std::string> input_filtered;
|
||||
for (std::vector<ItemStack>::const_iterator
|
||||
i = input.items.begin();
|
||||
i != input.items.end(); i++)
|
||||
{
|
||||
if(i->name != "")
|
||||
input_filtered.push_back(i->name);
|
||||
it = input.items.begin();
|
||||
it != input.items.end(); it++) {
|
||||
if (it->name != "")
|
||||
input_filtered.push_back(it->name);
|
||||
}
|
||||
|
||||
// If there is a wrong number of items in input, no match
|
||||
|
|
@ -655,7 +615,7 @@ void CraftDefinitionShapeless::decrementInput(CraftInput &input, IGameDef *gamed
|
|||
|
||||
CraftHashType CraftDefinitionShapeless::getHashType() const
|
||||
{
|
||||
assert(hash_inited); //pre-condition
|
||||
assert(hash_inited); // Pre-condition
|
||||
bool has_group = false;
|
||||
for (size_t i = 0; i < recipe_names.size(); i++) {
|
||||
if (isGroupRecipeStr(recipe_names[i])) {
|
||||
|
|
@ -671,14 +631,10 @@ CraftHashType CraftDefinitionShapeless::getHashType() const
|
|||
|
||||
u64 CraftDefinitionShapeless::getHash(CraftHashType type) const
|
||||
{
|
||||
assert(hash_inited); //pre-condition
|
||||
if (type == CRAFT_HASH_TYPE_ITEM_NAMES || type == CRAFT_HASH_TYPE_COUNT) {
|
||||
assert(hash_inited); // Pre-condition
|
||||
assert(type == CRAFT_HASH_TYPE_ITEM_NAMES
|
||||
|| type == CRAFT_HASH_TYPE_COUNT); // Pre-condition
|
||||
return getHashForGrid(type, recipe_names);
|
||||
} else {
|
||||
//illegal hash type for this CraftDefinition (pre-condition)
|
||||
assert(false);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void CraftDefinitionShapeless::initHash(IGameDef *gamedef)
|
||||
|
|
@ -733,8 +689,7 @@ static ItemStack craftToolRepair(
|
|||
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)
|
||||
{
|
||||
|| idef->get(item2.name).type != ITEM_TOOL) {
|
||||
// Failure
|
||||
return ItemStack();
|
||||
}
|
||||
|
|
@ -766,15 +721,13 @@ bool CraftDefinitionToolRepair::check(const CraftInput &input, IGameDef *gamedef
|
|||
ItemStack item1;
|
||||
ItemStack item2;
|
||||
for (std::vector<ItemStack>::const_iterator
|
||||
i = input.items.begin();
|
||||
i != input.items.end(); i++)
|
||||
{
|
||||
if(!i->empty())
|
||||
{
|
||||
it = input.items.begin();
|
||||
it != input.items.end(); it++) {
|
||||
if (!it->empty()) {
|
||||
if (item1.empty())
|
||||
item1 = *i;
|
||||
item1 = *it;
|
||||
else if (item2.empty())
|
||||
item2 = *i;
|
||||
item2 = *it;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
|
@ -788,15 +741,13 @@ CraftOutput CraftDefinitionToolRepair::getOutput(const CraftInput &input, IGameD
|
|||
ItemStack item1;
|
||||
ItemStack item2;
|
||||
for (std::vector<ItemStack>::const_iterator
|
||||
i = input.items.begin();
|
||||
i != input.items.end(); i++)
|
||||
{
|
||||
if(!i->empty())
|
||||
{
|
||||
it = input.items.begin();
|
||||
it != input.items.end(); it++) {
|
||||
if (!it->empty()) {
|
||||
if (item1.empty())
|
||||
item1 = *i;
|
||||
item1 = *it;
|
||||
else if (item2.empty())
|
||||
item2 = *i;
|
||||
item2 = *it;
|
||||
}
|
||||
}
|
||||
ItemStack repaired = craftToolRepair(item1, item2, additional_wear, gamedef);
|
||||
|
|
@ -851,11 +802,10 @@ bool CraftDefinitionCooking::check(const CraftInput &input, IGameDef *gamedef) c
|
|||
// Filter empty items out of input
|
||||
std::vector<std::string> input_filtered;
|
||||
for (std::vector<ItemStack>::const_iterator
|
||||
i = input.items.begin();
|
||||
i != input.items.end(); i++)
|
||||
{
|
||||
if(i->name != "")
|
||||
input_filtered.push_back(i->name);
|
||||
it = input.items.begin();
|
||||
it != input.items.end(); it++) {
|
||||
if (it->name != "")
|
||||
input_filtered.push_back(it->name);
|
||||
}
|
||||
|
||||
// If there is a wrong number of items in input, no match
|
||||
|
|
@ -961,11 +911,10 @@ bool CraftDefinitionFuel::check(const CraftInput &input, IGameDef *gamedef) cons
|
|||
// Filter empty items out of input
|
||||
std::vector<std::string> input_filtered;
|
||||
for (std::vector<ItemStack>::const_iterator
|
||||
i = input.items.begin();
|
||||
i != input.items.end(); i++)
|
||||
{
|
||||
if(i->name != "")
|
||||
input_filtered.push_back(i->name);
|
||||
it = input.items.begin();
|
||||
it != input.items.end(); it++) {
|
||||
if (it->name != "")
|
||||
input_filtered.push_back(it->name);
|
||||
}
|
||||
|
||||
// If there is a wrong number of items in input, no match
|
||||
|
|
@ -1076,9 +1025,9 @@ public:
|
|||
// If all input items are empty, abort.
|
||||
bool all_empty = true;
|
||||
for (std::vector<ItemStack>::const_iterator
|
||||
i = input.items.begin();
|
||||
i != input.items.end(); i++) {
|
||||
if (!i->empty()) {
|
||||
it = input.items.begin();
|
||||
it != input.items.end(); it++) {
|
||||
if (!it->empty()) {
|
||||
all_empty = false;
|
||||
break;
|
||||
}
|
||||
|
|
@ -1108,9 +1057,9 @@ public:
|
|||
// Walk crafting definitions from back to front, so that later
|
||||
// definitions can override earlier ones.
|
||||
for (std::vector<CraftDefinition*>::const_reverse_iterator
|
||||
i = hash_collisions.rbegin();
|
||||
i != hash_collisions.rend(); i++) {
|
||||
CraftDefinition *def = *i;
|
||||
it = hash_collisions.rbegin();
|
||||
it != hash_collisions.rend(); it++) {
|
||||
CraftDefinition *def = *it;
|
||||
|
||||
/*errorstream << "Checking " << input.dump() << std::endl
|
||||
<< " against " << def->dump() << std::endl;*/
|
||||
|
|
@ -1158,11 +1107,11 @@ public:
|
|||
os << "Crafting definitions:\n";
|
||||
for (int type = 0; type <= craft_hash_type_max; type++) {
|
||||
for (std::map<u64, std::vector<CraftDefinition*> >::const_iterator
|
||||
i = (m_craft_defs[type]).begin();
|
||||
i != (m_craft_defs[type]).end(); i++) {
|
||||
it = (m_craft_defs[type]).begin();
|
||||
it != (m_craft_defs[type]).end(); it++) {
|
||||
for (std::vector<CraftDefinition*>::const_iterator
|
||||
ii = i->second.begin(); ii != i->second.end(); ii++) {
|
||||
os << "type " << type << " hash " << i->first << (*ii)->dump() << "\n";
|
||||
iit = it->second.begin(); iit != it->second.end(); iit++) {
|
||||
os << "type " << type << " hash " << it->first << (*iit)->dump() << "\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1183,13 +1132,13 @@ public:
|
|||
{
|
||||
for (int type = 0; type <= craft_hash_type_max; type++) {
|
||||
for (std::map<u64, std::vector<CraftDefinition*> >::iterator
|
||||
i = m_craft_defs[type].begin();
|
||||
i != m_craft_defs[type].end(); i++) {
|
||||
it = m_craft_defs[type].begin();
|
||||
it != m_craft_defs[type].end(); it++) {
|
||||
for (std::vector<CraftDefinition*>::iterator
|
||||
ii = i->second.begin(); ii != i->second.end(); ii++) {
|
||||
delete *ii;
|
||||
iit = it->second.begin(); iit != it->second.end(); iit++) {
|
||||
delete *iit;
|
||||
}
|
||||
i->second.clear();
|
||||
it->second.clear();
|
||||
}
|
||||
m_craft_defs[type].clear();
|
||||
}
|
||||
|
|
@ -1199,9 +1148,9 @@ public:
|
|||
{
|
||||
// Move the CraftDefs from the unhashed layer into layers higher up.
|
||||
for (std::vector<CraftDefinition*>::iterator
|
||||
i = (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).begin();
|
||||
i != (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).end(); i++) {
|
||||
CraftDefinition *def = *i;
|
||||
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;
|
||||
|
||||
// Initialize and get the definition's hash
|
||||
def->initHash(gamedef);
|
||||
|
|
|
|||
Loading…
Reference in New Issue