Make raillike nodes connect to any other raillike nodes if both are in the group...

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index e2abcbfe79d747f5840613ff8d53b9e14cabf9e7..bee247ca975fac78f6fe6c34660f174fbb23990b 100644 (file)
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -584,6 +584,8 @@ Special groups
                   dropped as an item. If the node is wallmounted the
                   wallmounted direction is checked.
 - soil: saplings will grow on nodes in this group
+- connect_to_raillike: makes nodes of raillike drawtype connect to
+                       other group members with same drawtype
 
 Known damage and digging time defining groups
 ----------------------------------------------

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 155b39ab6c52a765667e671e02d7bf7fe631483c..84408e77695956a3fe5d4fe1261fbda6f508e262 100644 (file)
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -1188,34 +1188,81 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        MapNode n_minus_z_plus_y = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x, y+1, z-1));
                        MapNode n_plus_z_minus_y = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x, y-1, z+1));
                        MapNode n_minus_z_minus_y = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x, y-1, z-1));
-                       
+
                        content_t thiscontent = n.getContent();
-                       if(n_minus_x.getContent() == thiscontent)
+                       std::string groupname = "connect_to_raillike"; // name of the group that enables connecting to raillike nodes of different kind
+                       bool self_connect_to_raillike = ((ItemGroupList) nodedef->get(n).groups)[groupname] != 0;
+
+                       if ((nodedef->get(n_minus_x).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_minus_x).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_minus_x.getContent() == thiscontent)
                                is_rail_x[0] = true;
-                       if (n_minus_x_minus_y.getContent() == thiscontent)
+
+                       if ((nodedef->get(n_minus_x_minus_y).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_minus_x_minus_y).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_minus_x_minus_y.getContent() == thiscontent)
                                is_rail_x_minus_y[0] = true;
-                       if(n_minus_x_plus_y.getContent() == thiscontent)
+
+                       if ((nodedef->get(n_minus_x_plus_y).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_minus_x_plus_y).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_minus_x_plus_y.getContent() == thiscontent)
                                is_rail_x_plus_y[0] = true;
 
-                       if(n_plus_x.getContent() == thiscontent)
+                       if ((nodedef->get(n_plus_x).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_plus_x).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_plus_x.getContent() == thiscontent)
                                is_rail_x[1] = true;
-                       if (n_plus_x_minus_y.getContent() == thiscontent)
+
+                       if ((nodedef->get(n_plus_x_minus_y).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_plus_x_minus_y).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_plus_x_minus_y.getContent() == thiscontent)
                                is_rail_x_minus_y[1] = true;
-                       if(n_plus_x_plus_y.getContent() == thiscontent)
+
+                       if ((nodedef->get(n_plus_x_plus_y).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_plus_x_plus_y).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_plus_x_plus_y.getContent() == thiscontent)
                                is_rail_x_plus_y[1] = true;
 
-                       if(n_minus_z.getContent() == thiscontent)
+                       if ((nodedef->get(n_minus_z).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_minus_z).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_minus_z.getContent() == thiscontent)
                                is_rail_z[0] = true;
-                       if (n_minus_z_minus_y.getContent() == thiscontent)
+
+                       if ((nodedef->get(n_minus_z_minus_y).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_minus_z_minus_y).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_minus_z_minus_y.getContent() == thiscontent)
                                is_rail_z_minus_y[0] = true;
-                       if(n_minus_z_plus_y.getContent() == thiscontent)
+
+                       if ((nodedef->get(n_minus_z_plus_y).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_minus_z_plus_y).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_minus_z_plus_y.getContent() == thiscontent)
                                is_rail_z_plus_y[0] = true;
 
-                       if(n_plus_z.getContent() == thiscontent)
+                       if ((nodedef->get(n_plus_z).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_plus_z).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_plus_z.getContent() == thiscontent)
                                is_rail_z[1] = true;
-                       if (n_plus_z_minus_y.getContent() == thiscontent)
+
+                       if ((nodedef->get(n_plus_z_minus_y).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_plus_z_minus_y).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_plus_z_minus_y.getContent() == thiscontent)
                                is_rail_z_minus_y[1] = true;
-                       if(n_plus_z_plus_y.getContent() == thiscontent)
+
+                       if ((nodedef->get(n_plus_z_plus_y).drawtype == NDT_RAILLIKE
+                                       && ((ItemGroupList) nodedef->get(n_plus_z_plus_y).groups)[groupname] != 0
+                                       && self_connect_to_raillike)
+                                       || n_plus_z_plus_y.getContent() == thiscontent)
                                is_rail_z_plus_y[1] = true;
 
                        bool is_rail_x_all[] = {false, false};
@@ -1255,7 +1302,8 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                if(is_rail_x_all[0] && is_rail_x_all[1])
                                        angle = 90;
                                if(is_rail_z_all[0] && is_rail_z_all[1]){
-                                       if (n_minus_z_plus_y.getContent() == thiscontent) angle = 180;
+                                       if (is_rail_z_plus_y[0])
+                                               angle = 180;
                                }
                                else if(is_rail_x_all[0] && is_rail_z_all[0])
                                        angle = 270;