Changeset 7203 in orxonox.OLD for branches/std/src/story_entities/game_world_data.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/story_entities/game_world_data.cc (modified) (3 diffs)

branches/std/src/story_entities/game_world_data.cc

@@ -129 +129 @@
   // load the parameters
   // name
-  const char* string = grabParameter( root, "name");
-  if( string == NULL)
+  std::string string = grabParameter( root, "name");
+  if( string.empty() )
   {
     PRINTF(2)("GameWorld is missing a proper 'name'\n");
@@ -136 +136 @@
   }
   else
-    this->setName(string);
+    this->setName(string.c_str());
 
   this->loadGUI(root);
@@ -363 +363 @@
   {
     PRINTF(3)("Setting Sound Track to %s\n", name);
-    char* oggFile = ResourceManager::getFullName(name); /// FIXME
+    std::string oggFile = ResourceManager::getFullName(name);
     this->music = new OggPlayer(oggFile);
-    delete[] oggFile;
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);