Changeset 4653 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Jun 18, 2005, 2:44:14 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: still a strange bug in the TYPE-case of the resource manager…
temporarily fixed the importer

Location:

orxonox/trunk/src/util

Files:

• resource_manager.cc (modified) (4 diffs)
• resource_manager.h (modified) (2 diffs)

orxonox/trunk/src/util/resource_manager.cc

@@ -129 +129 @@
 }
 
-#ifndef NO_TEXTURE
+#ifndef NO_TEXTURES
 /**
    \brief adds a new Path for Images
@@ -223 +223 @@
    tmpType = IMAGE;
 #endif /* NO_TEXTURES */
-
+#undef __IF_OK
   return this->load(fileName, tmpType, prio, param1, param2, param3);
 }
@@ -459 +459 @@
 #endif /* NO_TEXTURES */
             default:
-              PRINTF(1)("NOT YET IMPLEMENTED !!FIX FIX!!\n");
+              PRINTF(2)("NOT YET IMPLEMENTED !!FIX FIX!!\n");
               return false;
               break;
@@ -821 +821 @@
           break;
 #endif
+#ifndef NO_AUDIO
+        case WAV:
+          PRINT(0)("SoundFile\n");
+#endif
         default:
-          PRINT(0)("SoundFile\n");
+          PRINT(0)("Do not know this format\n");
           break;
         }

orxonox/trunk/src/util/resource_manager.h

@@ -34 +34 @@
   MD2,                  //!< loading md2-file
 #endif /* NO_MODEL */
+#ifndef NO_TEXT
+  TTF,                  //!< loading a TrueTypeFont
+#endif /* NO_TEXT */
 #ifndef NO_AUDIO
   WAV,                  //!< loading wav
@@ -39 +42 @@
   OGG,                  //!< loading ogg
 #endif /* NO_AUDIO */
-#ifndef NO_TEXT
-  TTF,                  //!< loading a TrueTypeFont
-#endif /* NO_TEXT */
 #ifndef NO_TEXTURES
   IMAGE                 //!< loading an image