[Orxonox-commit 3973] r8647 - code/branches/presentation/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-28 20:01:37 +0200 (Sat, 28 May 2011)
New Revision: 8647

Modified:
   code/branches/presentation/src/libraries/core/GUIManager.cc
Log:
Attempt to fix incompatibility with CEGUI 0.7.
Doesn't yet work!

Modified: code/branches/presentation/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/presentation/src/libraries/core/GUIManager.cc	2011-05-28 17:35:35 UTC (rev 8646)
+++ code/branches/presentation/src/libraries/core/GUIManager.cc	2011-05-28 18:01:37 UTC (rev 8647)
@@ -742,6 +742,7 @@
     */
     /*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;
 
@@ -763,6 +764,12 @@
         font = CEGUI::FontManager::getSingleton().createFont("FreeType", xmlAttributes);
         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
     }
 
 }