diff options
| author | sfan5 <sfan5@live.de> | 2020-12-23 22:03:49 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2020-12-24 13:44:54 +0100 |
| commit | 74762470b2aa11a5271b846549ff14b86c1705d2 (patch) | |
| tree | cf4fd29ba05a94395674ac6cd5b2eeb7bdac0ee1 /src/irrlicht_changes | |
| parent | 289425f6bd6cfe1f66218918d9d5bd1b9f89aa7c (diff) | |
| download | minetest-74762470b2aa11a5271b846549ff14b86c1705d2.tar.gz minetest-74762470b2aa11a5271b846549ff14b86c1705d2.tar.bz2 minetest-74762470b2aa11a5271b846549ff14b86c1705d2.zip | |
Fix some minor code issues all over the place
Diffstat (limited to 'src/irrlicht_changes')
| -rw-r--r-- | src/irrlicht_changes/CGUITTFont.h | 2 | ||||
| -rw-r--r-- | src/irrlicht_changes/irrUString.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/irrlicht_changes/CGUITTFont.h b/src/irrlicht_changes/CGUITTFont.h index cf64934a2..310f74f67 100644 --- a/src/irrlicht_changes/CGUITTFont.h +++ b/src/irrlicht_changes/CGUITTFont.h @@ -356,7 +356,7 @@ namespace gui load_flags = FT_LOAD_DEFAULT | FT_LOAD_RENDER; if (!useHinting()) load_flags |= FT_LOAD_NO_HINTING; if (!useAutoHinting()) load_flags |= FT_LOAD_NO_AUTOHINT; - if (useMonochrome()) load_flags |= FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO | FT_RENDER_MODE_MONO; + if (useMonochrome()) load_flags |= FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO; else load_flags |= FT_LOAD_TARGET_NORMAL; } u32 getWidthFromCharacter(wchar_t c) const; diff --git a/src/irrlicht_changes/irrUString.h b/src/irrlicht_changes/irrUString.h index b628c092c..09172ee6d 100644 --- a/src/irrlicht_changes/irrUString.h +++ b/src/irrlicht_changes/irrUString.h @@ -1331,7 +1331,7 @@ public: { 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 @@ public: 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; |