L-systems treegen code tweaks.

RealBadAngel · RealBadAngel · commit 9f46cb6745a0 · 2014-06-17T00:55:04.000+02:00
diff --git a/src/treegen.cpp b/src/treegen.cpp
@@ -231,7 +231,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 +289,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 +309,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);

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd`
`231`	`231`	`tree_node_placement(vmanip,v3f(position.X,position.Y-1,position.Z+1),dirtnode);`
`232`	`232`	`tree_node_placement(vmanip,v3f(position.X+1,position.Y-1,position.Z+1),dirtnode);`
`233`	`233`	`}`
`234`		`- if (tree_definition.trunk_type == "crossed")`
	`234`	`+ else if (tree_definition.trunk_type == "crossed")`
`235`	`235`	`{`
`236`	`236`	`tree_node_placement(vmanip,v3f(position.X+1,position.Y-1,position.Z),dirtnode);`
`237`	`237`	`tree_node_placement(vmanip,v3f(position.X-1,position.Y-1,position.Z),dirtnode);`
`@@ -289,7 +289,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd`
`289`	`289`	`tree_trunk_placement(vmanip,v3f(position.X,position.Y,position.Z+1),tree_definition);`
`290`	`290`	`tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z+1),tree_definition);`
`291`	`291`	`}`
`292`		`- if (tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches)`
	`292`	`+ else if (tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches)`
`293`	`293`	`{`
`294`	`294`	`tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z),tree_definition);`
`295`	`295`	`tree_trunk_placement(vmanip,v3f(position.X-1,position.Y,position.Z),tree_definition);`
`@@ -309,7 +309,7 @@ void make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *nd`
`309`	`309`	`tree_trunk_placement(vmanip,v3f(position.X,position.Y,position.Z+1),tree_definition);`
`310`	`310`	`tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z+1),tree_definition);`
`311`	`311`	`}`
`312`		`- if ((stack_orientation.empty() && tree_definition.trunk_type == "crossed") \|\|`
	`312`	`+ else if ((stack_orientation.empty() && tree_definition.trunk_type == "crossed") \|\|`
`313`	`313`	`(!stack_orientation.empty() && tree_definition.trunk_type == "crossed" && !tree_definition.thin_branches))`
`314`	`314`	`{`
`315`	`315`	`tree_trunk_placement(vmanip,v3f(position.X+1,position.Y,position.Z),tree_definition);`