Changeset 7216 in orxonox.OLD for branches/std/src/story_entities

Timestamp:

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

Author:

bensch

Message:

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

Location:

branches/std/src/story_entities

Files:

• game_world_data.cc (modified) (3 diffs)
• game_world_data.h (modified) (1 diff)

branches/std/src/story_entities/game_world_data.cc

@@ -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);
+  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);

branches/std/src/story_entities/game_world_data.h

@@ -42 +42 @@
 
     /* interface functions */
-    void setSoundTrack(const char* name);
+    void setSoundTrack(const std::string& name);
     void loadGameRule(const TiXmlElement* root);