Changeset 7199 in orxonox.OLD for trunk/src/lib/util/loading

Timestamp:

Mar 8, 2006, 10:46:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: MultiType rework (now uses std::string) this is more compliant, and better to handle

File:

• trunk/src/lib/util/loading/resource_manager.cc (modified) (4 diffs)

trunk/src/lib/util/loading/resource_manager.cc

@@ -451 +451 @@
         tmpResource->param[0] = param0;
         tmpResource->param[1] = param1;
-        tmpResource->pointer = new MD2Data(fullName, tmpResource->param[0].getString(), tmpResource->param[1].getFloat());
+        tmpResource->pointer = new MD2Data(fullName, tmpResource->param[0].getCString(), tmpResource->param[1].getFloat());
       }
       break;
@@ -520 +520 @@
         {
           MultiType param = param0; /// HACK
-          char* secFullName = ResourceManager::getFullName(param.getString());
+          char* secFullName = ResourceManager::getFullName(param.getCString());
           if (ResourceManager::isFile(secFullName))
           {
@@ -747 +747 @@
   int len = strlen(ResourceManager::ResourceTypeToChar(this->resourceList[i]->type));
   len += strlen(this->resourceList[i]->name);
-  if (this->resourceList[i]->param[0].getString()) len += strlen(this->resourceList[i]->param[0].getString()) +1;
-  if (this->resourceList[i]->param[1].getString()) len += strlen(this->resourceList[i]->param[1].getString()) +1;
-  if (this->resourceList[i]->param[2].getString()) len += strlen(this->resourceList[i]->param[2].getString()) +1;
+  if (this->resourceList[i]->param[0].getCString()) len += strlen(this->resourceList[i]->param[0].getCString()) +1;
+  if (this->resourceList[i]->param[1].getCString()) len += strlen(this->resourceList[i]->param[1].getCString()) +1;
+  if (this->resourceList[i]->param[2].getCString()) len += strlen(this->resourceList[i]->param[2].getCString()) +1;
   len += 10;
   char* tmp = new char[len];
@@ -756 +756 @@
   strcat(tmp,",");
   strcat (tmp, this->resourceList[i]->name);
-  if (this->resourceList[i]->param[0].getString() && this->resourceList[i]->param[0].getString() != '\0')
+  if (this->resourceList[i]->param[0].getCString() && this->resourceList[i]->param[0].getCString() != '\0')
   {
     strcat(tmp,",");
-    strcat( tmp, this->resourceList[i]->param[0].getString());
-  }
-  if (this->resourceList[i]->param[1].getString() && this->resourceList[i]->param[1].getString() != '\0')
+    strcat( tmp, this->resourceList[i]->param[0].getCString());
+  }
+  if (this->resourceList[i]->param[1].getCString() && this->resourceList[i]->param[1].getCString() != '\0')
   {
     strcat(tmp,",");
-    strcat( tmp, this->resourceList[i]->param[1].getString());
-  }
-  if (this->resourceList[i]->param[2].getString() && this->resourceList[i]->param[2].getString() != '\0')
+    strcat( tmp, this->resourceList[i]->param[1].getCString());
+  }
+  if (this->resourceList[i]->param[2].getCString() && this->resourceList[i]->param[2].getCString() != '\0')
   {
     strcat(tmp,",");
-    strcat( tmp, this->resourceList[i]->param[2].getString());
+    strcat( tmp, this->resourceList[i]->param[2].getCString());
   }
   return tmp;