Changeset 5287 in orxonox.OLD for trunk/src

Timestamp:

Oct 6, 2005, 11:18:00 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed another 'BUG' inside of the deletion of the Fonts.
Now the fonts are deleted when deleting the TextEngine.

File:

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

trunk/src/lib/graphics/text_engine.cc

@@ -812 +812 @@
 TextEngine::~TextEngine ()
 {
+  // delete all remaining fonts (this is done in the ResourceManager)
+  tList<BaseObject>* fontList = ClassList::getList(CL_FONT);
+  if (fontList != NULL)
+  {
+    tIterator<BaseObject>* fontIterator = fontList->getIterator();
+    Font* font = dynamic_cast<Font*>(fontIterator->firstElement());
+    while( font != NULL)
+    {
+      ResourceManager::getInstance()->unload(font, RP_GAME);
+      font = dynamic_cast<Font*>(fontIterator->nextElement());
+    }
+    delete fontIterator;
+  }
+
   this->disableFonts();
 
@@ -874 +888 @@
 void TextEngine::debug() const
 {
-  PRINT(0)("+-------------------------------+\n");
-  PRINT(0)("+ TEXT ENGINE DEBUG INFORMATION +\n");
-  PRINT(0)("+-------------------------------+\n");
-  PRINT(0)("Reference: %p; Text Counts: %d\n", this, ClassList::getList(CL_TEXT)->getSize());
-
-  tIterator<BaseObject>* textIterator = ClassList::getList(CL_TEXT)->getIterator();
-  Text* text = dynamic_cast<Text*>(textIterator->firstElement());
-  while( text != NULL)
-    {
-      text->debug();
-      text = dynamic_cast<Text*>(textIterator->nextElement());
-    }
-  delete textIterator;
-  PRINT(0)("+---------------------------TE--+\n");
+  tList<BaseObject>* textList = ClassList::getList(CL_TEXT);
+  if (textList != NULL)
+  {
+    PRINT(0)("+-------------------------------+\n");
+    PRINT(0)("+ TEXT ENGINE DEBUG INFORMATION +\n");
+    PRINT(0)("+-------------------------------+\n");
+    PRINT(0)("Reference: %p; Text Counts: %d\n", this, textList->getSize());
+
+    tIterator<BaseObject>* textIterator = textList->getIterator();
+    Text* text = dynamic_cast<Text*>(textIterator->firstElement());
+    while( text != NULL)
+      {
+        text->debug();
+        text = dynamic_cast<Text*>(textIterator->nextElement());
+      }
+    delete textIterator;
+    PRINT(0)("+---------------------------TE--+\n");
+  }
 }