pgimeno
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix endless loop since grandparent commit

master
est31 2015-07-04 19:43:46 +02:00
parent c53520aa31
commit 64dc053209
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/craftdef.cpp
View File

@ -242,12 +242,13 @@ static std::string craftDumpMatrix(const std::vector<std::string> &items,
{
std::ostringstream os(std::ios::binary);
os << "{ ";
unsigned int x = 0;
for(std::vector<std::string>::size_type i = 0;
i < items.size(); i++) {
if (i == width) {
i < items.size(); i++, x++) {
if (x == width) {
os << "; ";
i = 0;
} else if (i != 0) {
x = 0;
} else if (x != 0) {
os << ",";
}
os << '"' << items[i] << '"';
@ -262,12 +263,13 @@ std::string craftDumpMatrix(const std::vector<ItemStack> &items,
{
std::ostringstream os(std::ios::binary);
os << "{ ";
unsigned int x = 0;
for (std::vector<ItemStack>::size_type i = 0;
i < items.size(); i++) {
if (i == width) {
i < items.size(); i++, x++) {
if (x == width) {
os << "; ";
i = 0;
} else if (i != 0) {
x = 0;
} else if (x != 0) {
os << ",";
}
os << '"' << (items[i].getItemString()) << '"';