Changeset 8761 in orxonox.OLD for trunk/src/lib/graphics/text_engine/text_engine.cc

Timestamp:

Jun 24, 2006, 2:16:12 AM (19 years ago)

Author:

bensch

Message:

merged the new Font-Implementation back here
merged with svn merge ​https://svn.orxonox.net/orxonox/branches/fontdata . -r8752:HEAD
no conflicts, naturally

File:

• trunk/src/lib/graphics/text_engine/text_engine.cc (modified) (2 diffs)

trunk/src/lib/graphics/text_engine/text_engine.cc

@@ -75 +75 @@
 //    while (fontList->size() > 0)
     {
-      Font* font = dynamic_cast<Font*>(fontList->back());
-      if (likely(font != Font::getDefaultFont()))
-        ResourceManager::getInstance()->unload(font, RP_GAME);
+//      Font* font = dynamic_cast<Font*>(fontList->back());
+      //if (likely(font != Font::getDefaultFont()))
+      //        ResourceManager::getInstance()->unload(font, RP_GAME);
     }
   }
@@ -108 +108 @@
   if (TTF_WasInit())
     {
-      Font::removeDefaultFont();
+//      Font::removeDefaultFont();
       TTF_Quit();
     }