From 64dc0532098ceeaa8a9de01984bd6a309578ec1e Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 4 Jul 2015 19:43:46 +0200 Subject: [PATCH] Fix endless loop since grandparent commit --- src/craftdef.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/craftdef.cpp b/src/craftdef.cpp index 022b98da3..409481e64 100644 --- a/src/craftdef.cpp +++ b/src/craftdef.cpp @@ -242,12 +242,13 @@ static std::string craftDumpMatrix(const std::vector &items, { std::ostringstream os(std::ios::binary); os << "{ "; + unsigned int x = 0; for(std::vector::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 &items, { std::ostringstream os(std::ios::binary); os << "{ "; + unsigned int x = 0; for (std::vector::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()) << '"';