Changeset 5344 in orxonox.OLD for trunk/src/util/resource_manager.cc

Timestamp:

Oct 10, 2005, 12:39:21 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new Way to load and unload Text

File:

• trunk/src/util/resource_manager.cc (modified) (3 diffs)

trunk/src/util/resource_manager.cc

@@ -30 +30 @@
 #endif /* NO_TEXTURES */
 #ifndef NO_TEXT
-#include "text_engine.h"
+#include "font.h"
+#include "text.h" //!< @todo this should not be included here. -> make FONT independant of SIZE...
 #endif /* NO_TEXT */
 #ifndef NO_AUDIO
@@ -359 +360 @@
               tmpResource->ttfSize = *(unsigned int*)param1;
             else
-              tmpResource->ttfSize = FONT_DEFAULT_SIZE;
+              tmpResource->ttfSize = TEXT_DEFAULT_SIZE;
 
           if(isFile(fullName))
@@ -613 +614 @@
               if (param1 == NULL)
                 {
-                  if (enumRes->ttfSize == FONT_DEFAULT_SIZE)
+                  if (enumRes->ttfSize == TEXT_DEFAULT_SIZE)
                     match = true;
                 }