Translated using Weblate (Japanese)

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

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 70a1da0b74fbc1bdf47207b80dd2b1d3b4cd07d8..c4d09e18c3a311fea912439db8b4057d5dc57727 100644 (file)
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_mapblock.h"
 #include "util/numeric.h"
 #include "util/directiontables.h"
-#include "main.h" // For g_settings
 #include "mapblock_mesh.h" // For MapBlock_LightColor() and MeshCollector
 #include "settings.h"
 #include "nodedef.h"
@@ -1549,7 +1548,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        std::vector<aabb3f> boxes = n.getNodeBoxes(nodedef);
                        for(std::vector<aabb3f>::iterator
                                        i = boxes.begin();
-                                       i != boxes.end(); i++)
+                                       i != boxes.end(); ++i)
                        {
                        for(int j = 0; j < 6; j++)
                                {
@@ -1686,11 +1685,11 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        std::vector<aabb3f> boxes = n.getSelectionBoxes(nodedef);
                        TileSpec h_tile;                        
                        h_tile.material_flags |= MATERIAL_FLAG_HIGHLIGHTED;
-                       h_tile.texture = tsrc->getTexture("halo.png",&h_tile.texture_id);
+                       h_tile.texture = tsrc->getTextureForMesh("halo.png",&h_tile.texture_id);
                        v3f pos = intToFloat(p, BS);
                        f32 d = 0.05 * BS;
                        for (std::vector<aabb3f>::iterator i = boxes.begin();
-                                       i != boxes.end(); i++) {
+                                       i != boxes.end(); ++i) {
                                aabb3f box = *i;
                                box.MinEdge += v3f(-d, -d, -d) + pos;
                                box.MaxEdge += v3f(d, d, d) + pos;