Changeset 7426 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Apr 28, 2006, 10:27:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ShellFont can be changed in threads

File:

• trunk/src/lib/graphics/text_engine/text.cc (modified) (1 diff)

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

@@ -65 +65 @@
 void Text::setFont(const std::string& fontFile, unsigned int fontSize)
 {
-  Font* tmpFont;
-  Text* newText;
-  Vector tmpVec;
-
-  // unloading the Font if we alrady have one loaded.
-  if (this->font != NULL && this->font != Font::getDefaultFont())
-    ResourceManager::getInstance()->unload(this->font);
-  this->font = NULL;
+  Font* newFont;
+  Font* oldFont = this->font;
 
   // load a new Font
   if (!fontFile.empty())
   {
-    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
-    if (tmpFont != NULL)
-      this->font = tmpFont;
-    else
+    newFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
+    if (newFont == NULL)
+    {
+      newFont = Font::getDefaultFont();
       PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile.c_str());
-  }
+    }
+  }
+  else
+    newFont = Font::getDefaultFont();
+
+  // unloading the Font if we alrady have one loaded.
+  this->font = newFont;
+  if (oldFont != NULL && oldFont != Font::getDefaultFont())
+    ResourceManager::getInstance()->unload(oldFont);
 }