summaryrefslogtreecommitdiff
path: root/src/irrlicht_changes
diff options
context:
space:
mode:
authorrubenwardy <rw@rubenwardy.com>2018-08-05 23:14:24 +0100
committerrubenwardy <rw@rubenwardy.com>2018-08-05 23:16:05 +0100
commit8d68b2cd210fea3cd852c648464c8bdd9cac02a7 (patch)
treeeb44dab2ef21b5cba02010762ce353b325ddc642 /src/irrlicht_changes
parentee63b94f2c9e176f549c4446391e4c59f5a5be53 (diff)
downloadminetest-8d68b2cd210fea3cd852c648464c8bdd9cac02a7.tar.gz
minetest-8d68b2cd210fea3cd852c648464c8bdd9cac02a7.tar.bz2
minetest-8d68b2cd210fea3cd852c648464c8bdd9cac02a7.zip
Fix debug and info text being the wrong color
Fixes #7623
Diffstat (limited to 'src/irrlicht_changes')
-rw-r--r--src/irrlicht_changes/static_text.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/irrlicht_changes/static_text.h b/src/irrlicht_changes/static_text.h
index c15bf869a..43c587284 100644
--- a/src/irrlicht_changes/static_text.h
+++ b/src/irrlicht_changes/static_text.h
@@ -274,7 +274,10 @@ inline void setStaticText(irr::gui::IGUIStaticText *static_text, const EnrichedS
inline void setStaticText(irr::gui::IGUIStaticText *static_text, const wchar_t *text)
{
- setStaticText(static_text, EnrichedString(text, static_text->getOverrideColor()));
+ auto color = static_text->isOverrideColorEnabled()
+ ? static_text->getOverrideColor()
+ : irr::video::SColor(255, 255, 255, 255);
+ setStaticText(static_text, EnrichedString(text, color));
}
#endif // _IRR_COMPILE_WITH_GUI_