Changeset 7221 in orxonox.OLD for trunk/src/story_entities/game_world_data.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/story_entities/game_world_data.cc (modified) (5 diffs)

trunk/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);
@@ -343 +343 @@
 
   if (this->music != NULL)
-    this->setSoundTrack(NULL);
+    this->setSoundTrack("");
   this->music = NULL;
   /* stop the sound eninge */
@@ -354 +354 @@
 
 
-void GameWorldData::setSoundTrack(const char* name)
+void GameWorldData::setSoundTrack(const std::string& name)
 {
   if (this->music != NULL)
@@ -360 +360 @@
   this->music = NULL;
 
-  if (name != NULL)
-  {
-    PRINTF(3)("Setting Sound Track to %s\n", name);
-    char* oggFile = ResourceManager::getFullName(name); /// FIXME
+  if (!name.empty())
+  {
+    PRINTF(3)("Setting Sound Track to %s\n", name.c_str());
+    std::string oggFile = ResourceManager::getFullName(name);
     this->music = new OggPlayer(oggFile);
-    delete[] oggFile;
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);