Fixes for android

[minetest.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index fa2f4c84e56c519c7dca694437fa81176a053ef9..b20aec54a271d8073b0fc152f03354f3cacc9e7e 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1380,7 +1380,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
                                return false;
                        }
 
-                       str_replace_char(part_of_name, '&', '^');
+                       str_replace(part_of_name, '&', '^');
                        Strfnd sf(part_of_name);
                        sf.next("{");
                        std::string imagename_top = sf.next("{");
@@ -1859,7 +1859,7 @@ void imageTransform(u32 transform, video::IImage *src, video::IImage *dst)
        core::dimension2d<u32> dstdim = dst->getDimension();
 
        assert(dstdim == imageTransformDimension(transform, srcdim));
-       assert(transform >= 0 && transform <= 7);
+       assert(transform <= 7);
 
        /*
                Compute the transformation from source coordinates (sx,sy)