Changeset 6988 in orxonox.OLD

Timestamp:

Feb 2, 2006, 8:31:10 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: soundEngine works again

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (4 diffs)
• world_entities/environments/model_entity.h (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -192 +192 @@
   this->dataTank->unloadData();
 
+  State::setCurrentStoryEntity(NULL);
   if (this->dataXML)
     delete this->dataXML;

trunk/src/story_entities/game_world_data.cc

@@ -162 +162 @@
     glmis->setBackgroundImage("pictures/load_screen.jpg");
     this->glmis->setMaximum(8);
-//     this->glmis->draw();
+    //     this->glmis->draw();
   }
   else
   {
     this->glmis->loadParams(element);
-//     this->glmis->draw();
+    //     this->glmis->draw();
   }
   this->glmis->draw();
@@ -257 +257 @@
     delete this->localPlayer;
 
-   nodeList = ClassList::getList(CL_GRAPHICS_EFFECT);
-   if (nodeList != NULL)
-     while (!nodeList->empty())
-       delete nodeList->front();
-//
-//   nodeList = ClassList::getList(CL_ELEMENT_2D);
-//   if (nodeList != NULL)
-//     while (!nodeList->empty())
-//       delete nodeList->front();
+  nodeList = ClassList::getList(CL_GRAPHICS_EFFECT);
+  if (nodeList != NULL)
+    while (!nodeList->empty())
+      delete nodeList->front();
+  //
+  //   nodeList = ClassList::getList(CL_ELEMENT_2D);
+  //   if (nodeList != NULL)
+  //     while (!nodeList->empty())
+  //       delete nodeList->front();
 
 
@@ -302 +302 @@
   LoadParam(root, "Music", this, GameWorldData, setSoundTrack);
 
-//  LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
+  //  LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
   //LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 
@@ -343 +343 @@
   {
     PRINTF(3)("Setting Sound Track to %s\n", name);
-    this->music = (OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);
-  }
-}
-
-
+    char* oggFile = ResourceManager::getFullName(name); /// FIXME
+    this->music = new OggPlayer(oggFile);
+    delete[] oggFile;
+
+    //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);
+    //assert(this->music->isA(CL_SOUND_OGG_PLAYER));
+  }
+}
+
+

trunk/src/world_entities/environments/model_entity.h

@@ -20 +20 @@
   virtual ~ModelEntity();
 
-
-  private:
-
 };