Translated using Weblate (Japanese)

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

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index bb4f102da224298ec2b38253843ae0bcd356a411..5a1578bba589f416fd0f26770b648df6f501a82f 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -65,7 +65,7 @@ void NodeBox::serialize(std::ostream &os, u16 protocol_version) const
                writeU16(os, fixed.size());
                for(std::vector<aabb3f>::const_iterator
                                i = fixed.begin();
-                               i != fixed.end(); i++)
+                               i != fixed.end(); ++i)
                {
                        writeV3F1000(os, i->MinEdge);
                        writeV3F1000(os, i->MaxEdge);
@@ -266,7 +266,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
        os<<serializeString(name);
        writeU16(os, groups.size());
        for(ItemGroupList::const_iterator
-                       i = groups.begin(); i != groups.end(); i++){
+                       i = groups.begin(); i != groups.end(); ++i){
                os<<serializeString(i->first);
                writeS16(os, i->second);
        }
@@ -709,7 +709,7 @@ void CNodeDefManager::updateAliases(IItemDefManager *idef)
        std::set<std::string> all = idef->getAll();
        m_name_id_mapping_with_aliases.clear();
        for (std::set<std::string>::iterator
-                       i = all.begin(); i != all.end(); i++) {
+                       i = all.begin(); i != all.end(); ++i) {
                std::string name = *i;
                std::string convert_to = idef->getAlias(name);
                content_t id;
@@ -1012,7 +1012,7 @@ void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
        if (use_normal_texture) {
                tile->normal_texture = tsrc->getNormalTexture(tiledef->name);
        }
-       tile->flags_texture = tsrc->getShaderFlagsTexture(tiledef, tile);
+       tile->flags_texture = tsrc->getShaderFlagsTexture(tile->normal_texture ? true : false);
 
        // Material flags
        tile->material_flags = 0;
@@ -1020,6 +1020,10 @@ void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
                tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
        if (tiledef->animation.type == TAT_VERTICAL_FRAMES)
                tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
+       if (tiledef->tileable_horizontal)
+               tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL;
+       if (tiledef->tileable_vertical)
+               tile->material_flags |= MATERIAL_FLAG_TILEABLE_VERTICAL;
 
        // Animation parameters
        int frame_count = 1;
@@ -1158,7 +1162,7 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const
                os<<serializeString(name);
                writeU16(os, groups.size());
                for (ItemGroupList::const_iterator
-                               i = groups.begin(); i != groups.end(); i++) {
+                               i = groups.begin(); i != groups.end(); ++i) {
                        os<<serializeString(i->first);
                        writeS16(os, i->second);
                }
@@ -1206,7 +1210,7 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const
                os<<serializeString(name);
                writeU16(os, groups.size());
                for (ItemGroupList::const_iterator
-                       i = groups.begin(); i != groups.end(); i++) {
+                       i = groups.begin(); i != groups.end(); ++i) {
                                os<<serializeString(i->first);
                                writeS16(os, i->second);
                }