aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-18 16:07:17 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-03-18 16:07:17 +0200
commit99d257ae8b8883f958381dc13d3017cdb2570eb0 (patch)
tree3f28289b3eee32094c3ea48289321945265d1790
parent2f2b7915eade91fe20af7c9e5e8921c35342a672 (diff)
downloadminetest-99d257ae8b8883f958381dc13d3017cdb2570eb0.tar.gz
minetest-99d257ae8b8883f958381dc13d3017cdb2570eb0.tar.bz2
minetest-99d257ae8b8883f958381dc13d3017cdb2570eb0.zip
"or" -> "||" in content_mapblock.cpp
-rw-r--r--src/content_mapblock.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 9a427a44e..d41aac81b 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -922,7 +922,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
if(adjacencies == 1)
{
- if(is_rail_x_all[0] or is_rail_x_all[1])
+ if(is_rail_x_all[0] || is_rail_x_all[1])
angle = 90;
}
if(adjacencies == 2)