Remove unused (de)serializeAttributes() methods

[dragonfireclient.git] / src / irrlicht_changes / CGUITTFont.h

diff --git a/src/irrlicht_changes/CGUITTFont.h b/src/irrlicht_changes/CGUITTFont.h
index 310f74f67b55e8f36e12c8d6248d1d27167ccd5e..7b04ae8280f8054669bf228b44e00d48b95bcf2e 100644 (file)
--- a/src/irrlicht_changes/CGUITTFont.h
+++ b/src/irrlicht_changes/CGUITTFont.h
@@ -34,7 +34,7 @@
 #include <irrlicht.h>
 #include <ft2build.h>
 #include <vector>
-#include "irrUString.h"
+#include <irrUString.h>
 #include "util/enriched_string.h"
 #include FT_FREETYPE_H
 
@@ -199,6 +199,7 @@ namespace gui
 
                        core::array<core::vector2di> render_positions;
                        core::array<core::recti> render_source_rects;
+                       core::array<video::SColor> render_colors;
 
                private:
                        core::array<const SGUITTGlyph*> glyph_to_be_paged;
@@ -269,8 +270,8 @@ namespace gui
                                video::SColor color, bool hcenter=false, bool vcenter=false,
                                const core::rect<s32>* clip=0);
 
-                       virtual void draw(const EnrichedString& text, const core::rect<s32>& position,
-                               video::SColor color, bool hcenter=false, bool vcenter=false,
+                       void draw(const EnrichedString& text, const core::rect<s32>& position,
+                               bool hcenter=false, bool vcenter=false,
                                const core::rect<s32>* clip=0);
 
                        //! Returns the dimension of a character produced by this font.
@@ -313,6 +314,9 @@ namespace gui
                        //! Get the last glyph page's index.
                        u32 getLastGlyphPageIndex() const { return Glyph_Pages.size() - 1; }
 
+                       //! Set font that should be used for glyphs not present in ours
+                       void setFallback(gui::IGUIFont* font) { fallback = font; }
+
                        //! Create corresponding character's software image copy from the font,
                        //! so you can use this data just like any ordinary video::IImage.
                        //! \param ch The character you need
@@ -387,6 +391,8 @@ namespace gui
                        core::ustring Invisible;
                        u32 shadow_offset;
                        u32 shadow_alpha;
+
+                       gui::IGUIFont* fallback;
        };
 
 } // end namespace gui