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

Timestamp:

Sep 22, 2005, 4:02:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some more fixing of the Errors reported by valgrind
removed some stuff in patrick's collision-detection.
also changed Vector* to Vector in Rectangle (patrick tell me, if this is not ok - but i doubt it

File:

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

trunk/src/lib/graphics/text_engine.cc

@@ -405 +405 @@
   // setting default values.
   this->font = NULL;
-  this->fontFile = NULL;
   this->glyphArray = NULL;
   this->fastTextureID = 0;
@@ -446 +445 @@
 bool Font::loadFont(const char* fontFile)
 {
-  if (!this->fontFile)
+  if (!this->getName())
     {
       this->setName(fontFile);
-      this->fontFile = new char[strlen(fontFile)+1];
-      strcpy(this->fontFile, fontFile);
-
-      this->font = TTF_OpenFont(this->fontFile, this->fontSize);
+
+      this->font = TTF_OpenFont(this->getName(), this->fontSize);
       if(!this->font)
         {