Added configurable selectionbox width. Min width = 1, Max = 5

[oweals/minetest.git] / src / treegen.cpp

diff --git a/src/treegen.cpp b/src/treegen.cpp
index 914479391543a2aa73722dbb5051173cbb17c75b..bd4a2f2c9b9760d0a439f8b9f63922e32907b864 100644 (file)
--- a/src/treegen.cpp
+++ b/src/treegen.cpp
@@ -118,14 +118,19 @@ void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
 }
 
 // L-System tree LUA spawner
-void spawn_ltree(ServerEnvironment *env, v3s16 p0, INodeDefManager *ndef, TreeDef tree_definition)
+treegen::error spawn_ltree(ServerEnvironment *env, v3s16 p0, INodeDefManager *ndef, TreeDef tree_definition)
 {
        ServerMap *map = &env->getServerMap();
        std::map<v3s16, MapBlock*> modified_blocks;
        ManualMapVoxelManipulator vmanip(map);
        v3s16 tree_blockp = getNodeBlockPos(p0);
+       treegen::error e;
+
        vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,3,1));
-       make_ltree (vmanip, p0, ndef, tree_definition);
+       e = make_ltree (vmanip, p0, ndef, tree_definition);
+       if (e != SUCCESS)
+               return e;
+
        vmanip.blitBackAll(&modified_blocks);
 
        // update lighting
@@ -142,15 +147,25 @@ void spawn_ltree(ServerEnvironment *env, v3s16 p0, INodeDefManager *ndef, TreeDe
                event.modified_blocks.insert(i->first);
        }
        map->dispatchEvent(&event);
+       return SUCCESS;
 }
 
 //L-System tree generator
-void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *ndef,
+treegen::error make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *ndef,
                TreeDef tree_definition)
 {
        MapNode dirtnode(ndef->getId("mapgen_dirt"));
+       int seed;
+       if (tree_definition.explicit_seed)
+       {
+               seed = tree_definition.seed+14002;
+       }
+       else
+       {
+               seed = p0.X*2 + p0.Y*4 + p0.Z;      // use the tree position to seed PRNG
+       }
+       PseudoRandom ps(seed);
 
-       PseudoRandom ps(tree_definition.seed+14002);
        // chance of inserting abcd rules
        double prop_a = 9;
        double prop_b = 8;
@@ -231,7 +246,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd
                tree_node_placement(vmanip,v3f(position.X,position.Y-1,position.Z+1),dirtnode);
                tree_node_placement(vmanip,v3f(position.X+1,position.Y-1,position.Z+1),dirtnode);
        }
-       if (tree_definition.trunk_type == "crossed")
+       else if (tree_definition.trunk_type == "crossed")
        {
                tree_node_placement(vmanip,v3f(position.X+1,position.Y-1,position.Z),dirtnode);
                tree_node_placement(vmanip,v3f(position.X-1,position.Y-1,position.Z),dirtnode);
@@ -289,7 +304,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd
                                tree_trunk_placement(vmanip,v3f(position.X,position.Y,position.Z+1),tree_definition);
                                tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z+1),tree_definition);
                        }
-                       if (tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches)
+                       else if (tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches)
                        {
                                tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z),tree_definition);
                                tree_trunk_placement(vmanip,v3f(position.X-1,position.Y,position.Z),tree_definition);
@@ -309,7 +324,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd
                                tree_trunk_placement(vmanip,v3f(position.X,position.Y,position.Z+1),tree_definition);
                                tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z+1),tree_definition);
                        }
-                       if ((stack_orientation.empty() && tree_definition.trunk_type == "crossed") ||
+                       else if ((stack_orientation.empty() && tree_definition.trunk_type == "crossed") ||
                                (!stack_orientation.empty() && tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches))
                        {
                                tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z),tree_definition);
@@ -354,6 +369,8 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd
                        stack_position.push(position);
                        break;
                case ']':
+                       if (stack_orientation.empty())
+                               return UNBALANCED_BRACKETS;
                        rotation=stack_orientation.top();
                        stack_orientation.pop();
                        position=stack_position.top();
@@ -393,6 +410,8 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd
                        break;
                }
        }
+
+       return SUCCESS;
 }
 
 void tree_node_placement(ManualMapVoxelManipulator &vmanip, v3f p0,