Changeset 5125 in orxonox.OLD for trunk/src/lib

Timestamp:

Aug 25, 2005, 3:04:49 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: a first command can be executed 'clear'
also improved the seg-fault-protection of the TextEngine

File:

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

trunk/src/lib/graphics/text_engine.cc

@@ -120 +120 @@
     }
     else
-    {
-      this->text = new char[1];
-      *this->text = '\0';
-    }
+      this->text = NULL;
   }
 
@@ -135 +132 @@
       if (this->externText == NULL)
         tmpText = this->text;
-      while (*tmpText != '\0')
+      if (tmpText != NULL)
+      {
+        while (*tmpText != '\0')
         {
           if(glyphArray[*tmpText])
-            {
-              width += glyphArray[*tmpText]->width;
-            }
+          {
+            width += glyphArray[*tmpText]->width;
+          }
           tmpText++;
         }
-      this->width = width;
+        this->width = width;
+      }
     }
 }
@@ -205 +205 @@
       if (this->externText == NULL)
         tmpText = this->text;
-      while (*tmpText != '\0')
+      if (likely(tmpText != NULL))
       {
-        if(glyphArray[*tmpText])
+        while (*tmpText != '\0')
         {
-          glCallList(glyphArray[*tmpText]->displayList);
-          glTranslatef(glyphArray[*tmpText]->width, 0, 0);
+          if(glyphArray[*tmpText])
+          {
+            glCallList(glyphArray[*tmpText]->displayList);
+            glTranslatef(glyphArray[*tmpText]->width, 0, 0);
+          }
+          tmpText++;
         }
-        tmpText++;
-      }    }
+      }
+    }
   else //(if type & TEXT_RENDER_STATIC)
     {