Changeset 7203 in orxonox.OLD for branches/std/src/orxonox.cc

Timestamp:

Mar 9, 2006, 5:28:10 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles again, BUT well…. i do not expect it to run anymore

File:

• branches/std/src/orxonox.cc (modified) (8 diffs)

branches/std/src/orxonox.cc

@@ -86 +86 @@
   this->port = -1;
 
-  this->configFileName = NULL;
+  this->configFileName = "";
 }
 
@@ -117 +117 @@
   // orxonox class-stuff
   delete this->iniParser;
-  delete[] this->configFileName;
 
   SDL_QuitSubSystem(SDL_INIT_TIMER);
@@ -162 +161 @@
 
 /**
- *  this finds the config file
+ * @brief this finds the config file
  * @returns the new config-fileName
  * Since the config file varies from user to user and since one may want to specify different config files
@@ -168 +167 @@
  * it's path and name into configfilename
 */
-const char* Orxonox::getConfigFile ()
+const std::string& Orxonox::getConfigFile ()
 {
   if (ResourceManager::isFile("orxonox.conf"))
   {
-    this->configFileName = new char[strlen("orxonox.conf")+1];
-    strcpy(this->configFileName, "orxonox.conf");
+    this->configFileName =  "orxonox.conf";
   }
   else
@@ -231 +229 @@
   GraphicsEngine::getInstance()->initFromIniFile(this->iniParser);
 
-  char* iconName = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
-  if (iconName != NULL)
+  std::string iconName = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
+  if (!iconName.empty())
   {
     GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, iconName);
-    delete[] iconName;
   }
   return 0;
@@ -301 +298 @@
 
   // init the resource manager
-  const char* dataPath;
-  if ((dataPath = this->iniParser->getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= NULL)
+  std::string dataPath;
+  if ((dataPath = this->iniParser->getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= "")
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath) &&
         !ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
     {
-      PRINTF(1)("Data Could not be located in %s\n", dataPath);
+      PRINTF(1)("Data Could not be located in %s\n", dataPath.c_str());
     }
   }
@@ -315 +312 @@
     PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \
               "!!!  Please Change in File %s Section %s Entry %s to a suitable value !!!\n",
-              ResourceManager::getInstance()->getDataDir(),
-              this->configFileName,
+    ResourceManager::getInstance()->getDataDir().c_str(),
+    this->configFileName.c_str(),
               CONFIG_SECTION_DATA,
               CONFIG_NAME_DATADIR );
@@ -325 +322 @@
   }
   //! @todo this is a hack and should be loadable
-  char* imageDir = ResourceManager::getInstance()->getFullName("maps");
+  std::string imageDir = ResourceManager::getInstance()->getFullName("maps");
   ResourceManager::getInstance()->addImageDir(imageDir);
-  delete[] imageDir;
   imageDir = ResourceManager::getInstance()->getFullName("pictures");
   ResourceManager::getInstance()->addImageDir(imageDir);
-  delete[] imageDir;
 
   DynamicLoader::loadDyLib("libtest.so");