Translated using Weblate (Japanese)

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

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 0335755e99a5345c1c97d3562d300b7d4b758334..732237833c4e391abb5d7281824e1fd09a141d62 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "mapnode.h"
 #include "porting.h"
-#include "main.h" // For g_settings
 #include "nodedef.h"
 #include "content_mapnode.h" // For mapnode_translate_*_internal
 #include "serialization.h" // For ser_ver_supported
@@ -164,6 +163,9 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) {
        ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
 
        if (cpt2 == CPT2_FACEDIR) {
+               if (param2 >= 4)
+                       return;
+
                u8 newrot = param2 & 3;
                param2 &= ~3;
                param2 |= (newrot + rot) & 3;
@@ -190,7 +192,7 @@ static std::vector<aabb3f> transformNodeBox(const MapNode &n,
                facedir&=0x03;
                for(std::vector<aabb3f>::const_iterator
                                i = fixed.begin();
-                               i != fixed.end(); i++)
+                               i != fixed.end(); ++i)
                {
                        aabb3f box = *i;