From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 25 Sep 2015 23:28:48 +0000 (+0100)
Subject: Decorations: Remove error message 'chunksize not divisable by sidelen'
X-Git-Tag: 0.4.14~668
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ffe291cb78fc7135034fe6456b2d7dfc3761dc52;p=oweals%2Fminetest.git

Decorations: Remove error message 'chunksize not divisable by sidelen'

Sidelen larger than 16 is essential for low density decorations
With sidelen > 16 chunksize may not be divisable by sidelen if
chunksize is changed, in this situation setting sidelen = chunksize
is desirable and should not create error messages.
---

diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index f11a71518..4f543a7dd 100644
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -90,11 +90,9 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 	int carea_size = nmax.X - nmin.X + 1;
 
 	// Divide area into parts
-	if (carea_size % sidelen) {
-		errorstream << "Decoration::placeDeco: chunk size is not divisible by "
-			"sidelen; setting sidelen to " << carea_size << std::endl;
+	// If chunksize is changed it may no longer be divisable by sidelen
+	if (carea_size % sidelen)
 		sidelen = carea_size;
-	}
 
 	s16 divlen = carea_size / sidelen;
 	int area = sidelen * sidelen;