From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 18 Mar 2012 14:07:17 +0000 (+0200)
Subject: "or" -> "||" in content_mapblock.cpp
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=99d257ae8b8883f958381dc13d3017cdb2570eb0;p=zefram%2Fminetest%2Fminetest_engine.git

"or" -> "||" in content_mapblock.cpp
---

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 9a427a44..d41aac81 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)