Include irrlichttypes.h first to work around Irrlicht#433 (#10872)

[minetest.git] / src / irrlicht_changes / irrUString.h

diff --git a/src/irrlicht_changes/irrUString.h b/src/irrlicht_changes/irrUString.h
index b628c092c28b5a2371d65910ec81f126a498626a..09172ee6dc384a28fdb3fd1cda262e365b0dfa51 100644 (file)
--- a/src/irrlicht_changes/irrUString.h
+++ b/src/irrlicht_changes/irrUString.h
@@ -1331,7 +1331,7 @@ class ustring16
        {
                u32 i;
                const uchar16_t* oa = other.c_str();
-               for(i=0; array[i] && oa[i] && i < n; ++i)
+               for(i=0; i < n && array[i] && oa[i]; ++i)
                        if (array[i] != oa[i])
                                return false;
 
@@ -1350,7 +1350,7 @@ class ustring16
                if (!str)
                        return false;
                u32 i;
-               for(i=0; array[i] && str[i] && i < n; ++i)
+               for(i=0; i < n && array[i] && str[i]; ++i)
                        if (array[i] != str[i])
                                return false;