Changeset 7216 in orxonox.OLD for branches/std/src/world_entities/world_entity.cc

Timestamp:

Mar 12, 2006, 8:54:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/std:: compile and run again, with many more std::strings….

File:

• branches/std/src/world_entities/world_entity.cc (modified) (4 diffs)

branches/std/src/world_entities/world_entity.cc

@@ -61 +61 @@
   this->bCollide = true;
 
-  this->md2TextureFileName = NULL;
-
   this->objectListNumber = OM_INIT;
   this->objectListIterator = NULL;
@@ -123 +121 @@
  * @todo fix this, so it only has one loadModel-Function.
 */
-void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
+void WorldEntity::loadModel(const std::string& fileName, float scaling, unsigned int modelNumber)
 {
   this->modelLODName = fileName;
   this->scaling = scaling;
-  if ( fileName != NULL && strcmp(fileName, "") )
+  if (!fileName.empty())
   {
     // search for the special character # in the LoadParam
-    if (strchr(fileName, '#') != NULL)
-    {
-      PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
-      char* lodFile = new char[strlen(fileName)+1];
-      strcpy(lodFile, fileName);
-      char* depth = strchr(lodFile, '#');
+    if (fileName.find('#') != std::string::npos)
+    {
+      PRINTF(4)("Found # in %s... searching for LOD's\n", fileName.c_str());
+      std::string lodFile = fileName;
+      unsigned int offset = lodFile.find('#');
       for (unsigned int i = 0; i < 3; i++)
       {
-        *depth = 48+(int)i;
+        lodFile[offset] = 48+(int)i;
         if (ResourceManager::isInDataDir(lodFile))
           this->loadModel(lodFile, scaling, i);
@@ -149 +146 @@
       this->scaling = 1.0;
     }
-    if(strstr(fileName, ".obj"))
-    {
-      PRINTF(4)("fetching OBJ file: %s\n", fileName);
+    if(fileName.find(".obj") != std::string::npos)
+    {
+      PRINTF(4)("fetching OBJ file: %s\n", fileName.c_str());
       BaseObject* loadedModel = ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling);
       if (loadedModel != NULL)
@@ -159 +156 @@
         this->buildObbTree(4);
     }
-    else if(strstr(fileName, ".md2"))
-    {
-      PRINTF(4)("fetching MD2 file: %s\n", fileName);
+    else if(fileName.find(".md2") != std::string::npos)
+    {
+      PRINTF(4)("fetching MD2 file: %s\n", fileName.c_str());
       Model* m = new MD2Model(fileName, this->md2TextureFileName, this->scaling);
       //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);