aboutsummaryrefslogtreecommitdiff
path: root/src/irrlicht_changes/static_text.cpp
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2021-03-26 14:00:57 +0100
committerElias Fleckenstein <eliasfleckenstein@web.de>2021-03-26 14:00:57 +0100
commit880c9768a9323800ca8d44cc4b73e92278e58743 (patch)
treecf5b0b340e7a02bff8e13ae364901b324114228b /src/irrlicht_changes/static_text.cpp
parent83d09ffaf688aac9f2de67d06420572e4d0664dc (diff)
parent437d01196899f85bbc77d71123018aa26be337da (diff)
downloaddragonfireclient-880c9768a9323800ca8d44cc4b73e92278e58743.tar.xz
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'src/irrlicht_changes/static_text.cpp')
-rw-r--r--src/irrlicht_changes/static_text.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/irrlicht_changes/static_text.cpp b/src/irrlicht_changes/static_text.cpp
index bf61cd64e..a8cc33352 100644
--- a/src/irrlicht_changes/static_text.cpp
+++ b/src/irrlicht_changes/static_text.cpp
@@ -255,6 +255,12 @@ video::SColor StaticText::getOverrideColor() const
return ColoredText.getDefaultColor();
}
+#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
+video::SColor StaticText::getActiveColor() const
+{
+ return getOverrideColor();
+}
+#endif
//! Sets if the static text should use the overide color or the
//! color in the gui skin.