summaryrefslogtreecommitdiff
path: root/src/mapgen.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-06-17 18:23:31 -0400
committerkwolekr <kwolekr@minetest.net>2013-06-17 18:23:31 -0400
commit56093b6614a47b181bbce6d4e35d213a4e04120c (patch)
treecd5ac885638f130f90034de6752e23c06c9bc81c /src/mapgen.cpp
parent0a8519a26fc7c10b4e7415746e9045caa3ae978f (diff)
downloadminetest-56093b6614a47b181bbce6d4e35d213a4e04120c.tar.gz
minetest-56093b6614a47b181bbce6d4e35d213a4e04120c.tar.bz2
minetest-56093b6614a47b181bbce6d4e35d213a4e04120c.zip
Decoration: Change divlen to sidelen
Diffstat (limited to 'src/mapgen.cpp')
-rw-r--r--src/mapgen.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 49ac827e1..17afcf350 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -232,8 +232,14 @@ void Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
int carea_size = nmax.X - nmin.X + 1;
// Divide area into parts
- s16 sidelen = carea_size / divlen;
- float area = sidelen * sidelen;
+ if (carea_size % sidelen) {
+ errorstream << "Decoration::placeDeco: chunk size is not divisible by "
+ "sidelen; setting sidelen to " << carea_size << std::endl;
+ sidelen = carea_size;
+ }
+
+ s16 divlen = carea_size / sidelen;
+ int area = sidelen * sidelen;
for (s16 z0 = 0; z0 < divlen; z0++)
for (s16 x0 = 0; x0 < divlen; x0++) {