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

Timestamp:

Jul 24, 2005, 12:36:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more loadability functionality in Weapon and FastFactory

Location:

orxonox/trunk/src/util

Files:

• fast_factory.cc (modified) (3 diffs)
• fast_factory.h (modified) (2 diffs)

orxonox/trunk/src/util/fast_factory.cc

@@ -18 +18 @@
 #include "compiler.h"
 #include "debug.h"
+#include "string.h"
 
 using namespace std;
@@ -83 +84 @@
 /**
  * searches for a FastFactory
- * @param factoryName the Name of the Factory to search for (not used)
  * @param classID the ClassID of the FastFactory to search for
  * @returns true if found, false otherwise.
  */
-FastFactory* FastFactory::searchFastFactory(ClassID classID, const char* fastFactoryName)
+FastFactory* FastFactory::searchFastFactory(ClassID classID)
 {
   if (FastFactory::first == NULL)
@@ -97 +97 @@
     {
       if (tmpFac->storedClassID == classID)
+        return tmpFac;
+      tmpFac = tmpFac->next;
+    }
+  }
+  return NULL;
+}
+
+/**
+ * searches for a FastFactory
+ * @param classID the ClassID of the FastFactory to search for
+ * @returns true if found, false otherwise.
+ */
+FastFactory* FastFactory::searchFastFactory(const char* fastFactoryName)
+{
+  if (FastFactory::first == NULL)
+    return NULL;
+  else
+  {
+    FastFactory* tmpFac = FastFactory::first;
+    while (tmpFac != NULL)
+    {
+      if (strcmp(tmpFac->getName(), fastFactoryName))
         return tmpFac;
       tmpFac = tmpFac->next;

orxonox/trunk/src/util/fast_factory.h

@@ -66 +66 @@
     inline static FastFactory* getFirst() { return FastFactory::first; };
 
-    static FastFactory* searchFastFactory(ClassID classID, const char* fastFactoryName = NULL);
+    static FastFactory* searchFastFactory(ClassID classID);
+    static FastFactory* searchFastFactory(const char* fastFactoryName);
+
+    ClassID getStoredID() const { return this->storedClassID; };
 
   protected:
@@ -135 +138 @@
   tFastFactory<T>* tmpFac = NULL;
   if (FastFactory::getFirst() != NULL)
-    tmpFac = static_cast<tFastFactory<T>*>(FastFactory::getFirst()->searchFastFactory(classID, fastFactoryName));
+    tmpFac = static_cast<tFastFactory<T>*>(FastFactory::getFirst()->searchFastFactory(classID));
 
   if (tmpFac != NULL)