Changeset 6650 in orxonox.OLD

Timestamp:

Jan 21, 2006, 7:16:30 PM (18 years ago)

Author:

bensch

Message:

trunk: cache bools

Location:

trunk/src/util/loading

Files:

• resource_manager.cc (modified) (3 diffs)
• resource_manager.h (modified) (1 diff)

trunk/src/util/loading/resource_manager.cc

@@ -299 +299 @@
  * @see load;
  *
+ * @brief returns true if ok, false otherwise.
  * This function loads a Resource without applying it to an Object.
  * This is for loading purposes, e.g, when the user is loading a Resource
  * during the initialisation instead of at Runtime.
  */
-void ResourceManager::cache(const char* fileName, ResourceType type, ResourcePriority prio,
+bool ResourceManager::cache(const char* fileName, ResourceType type, ResourcePriority prio,
                             const MultiType& param0, const MultiType& param1, const MultiType& param2)
 {
@@ -317 +318 @@
   // return cached pointer.
   if (tmpResource != NULL) // if the resource was loaded before.
+  {
     if(tmpResource->prio < prio)
       tmpResource->prio = prio;
+    return true;
+  }
+  else
+    return false;
 }
 
@@ -799 +805 @@
                 RP_LEVEL);
   else if (splits.getCount() == 3)
-    this->cache(splits[1], ResourceManager::stringToResourceType(splits[0]),
+    return this->cache(splits[1], ResourceManager::stringToResourceType(splits[0]),
                 RP_LEVEL, splits[2]);
   else if (splits.getCount() == 4)
-    this->cache(splits[1], ResourceManager::stringToResourceType(splits[0]),
+    return this->cache(splits[1], ResourceManager::stringToResourceType(splits[0]),
                 RP_LEVEL, splits[2], splits[3]);
   else if (splits.getCount() == 5)
-    this->cache(splits[1], ResourceManager::stringToResourceType(splits[0]),
+    return this->cache(splits[1], ResourceManager::stringToResourceType(splits[0]),
                 RP_LEVEL, splits[2], splits[3], splits[4]);
 }

trunk/src/util/loading/resource_manager.h

@@ -105 +105 @@
   bool addImageDir(const char* imageDir);
 
-  void cache(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
+  bool cache(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
              const MultiType& param0 = MultiType(), const MultiType& param1 = MultiType(), const MultiType& param2 = MultiType());