Changeset 8647 for code/branches

Timestamp:

May 28, 2011, 8:01:37 PM (13 years ago)

Author:

rgrieder

Message:

Attempt to fix incompatibility with CEGUI 0.7.
Doesn't yet work!

File:

• code/branches/presentation/src/libraries/core/GUIManager.cc (modified) (2 diffs)

code/branches/presentation/src/libraries/core/GUIManager.cc

@@ -743 +743 @@
     /*static*/ void GUIManager::addFontHelper(const std::string& name, int size, const std::string& fontName)
     {
+#ifdef ORXONOX_OLD_CEGUI
         if(CEGUI::FontManager::getSingleton().isFontPresent(name)) // If a font with that name already exists.
             return;
@@ -764 +765 @@
         if(font != NULL)
             font->load();
+#else
+        if(CEGUI::FontManager::getSingleton().isDefined(name)) // If a font with that name already exists.
+            return;
+
+        CEGUI::FontManager::getSingleton().createFreeTypeFont(name, (float)size, true, fontName, "", true, 800.0f, 600.0f);
+#endif
     }