Merge branch 'master' into dtt-merge

Conflicts: chunk.py
2011-03-06 18:05:28 -05:00
parent be26dc702b 9c7d6a184d
commit 5a05105b62
5 changed files with 231 additions and 227 deletions
--- a/quadtree.py
+++ b/quadtree.py
@@ -120,7 +120,7 @@ class QuadtreeGen(object):
                        yradius >= worldobj.maxrow and -yradius <= worldobj.minrow:
                    break
            else:
-                raise ValueError("Your map is waaaay too big!")
+                raise ValueError("Your map is waaaay too big! Use the '-z' or '--zoom' options.")

            self.p = p
        else: