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

Timestamp:

Apr 13, 2006, 10:41:48 PM (19 years ago)

Author:

bensch

Message:

merged back with:
svn merge . . -rHEAD:PREV

File:

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

trunk/src/story_entities/game_world_data.cc

@@ -28 +28 @@
 #include "util/loading/game_loader.h"
 
+#include "p_node.h"
 #include "world_entity.h"
 #include "player.h"
 #include "camera.h"
 #include "environment.h"
+#include "terrain.h"
+#include "test_entity.h"
+#include "terrain.h"
 #include "skybox.h"
-#include "terrain.h"
+#include "md2Model.h"
+#include "world_entities/projectiles/projectile.h"
+#include "npcs/npc_test1.h"
 #include "playable.h"
 
@@ -119 +125 @@
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadData(const TiXmlElement* root)
+ErrorMessage GameWorldData::loadData(TiXmlElement* root)
 {
   // load the parameters
@@ -153 +159 @@
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadGUI(const TiXmlElement* root)
-{
-  const TiXmlElement* element = root->FirstChildElement("LoadScreen");
+ErrorMessage GameWorldData::loadGUI(TiXmlElement* root)
+{
+  TiXmlElement* element = root->FirstChildElement("LoadScreen");
   if( element == NULL)
   {
@@ -186 +192 @@
  * @param root reference to the xml root parameter
  */
-ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root)
-{
-  const TiXmlElement* element = root->FirstChildElement("WorldEntities");
+ErrorMessage GameWorldData::loadWorldEntities(TiXmlElement* root)
+{
+  TiXmlElement* element = root->FirstChildElement("WorldEntities");
 
   if( element == NULL)
@@ -204 +210 @@
       if( created != NULL )
         PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
-      else
-      {
-        PRINTF(2)("Unable to create a %s\n", element->Value());
-        element = element->NextSiblingElement();
-        continue;
-      }
 
       //todo do this more elegant
@@ -310 +310 @@
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadScene(const TiXmlElement* root)
+ErrorMessage GameWorldData::loadScene(TiXmlElement* root)
 {
   LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
@@ -342 +342 @@
   delete PhysicsEngine::getInstance();
 
-  this->setSoundTrack("");
-
+  if (this->music != NULL)
+    this->setSoundTrack("");
+  this->music = NULL;
   /* stop the sound eninge */
   SoundEngine::getInstance()->flushAllBuffers();
@@ -356 +357 @@
 {
   if (this->music != NULL)
-  {
-    OggPlayer* oldMusic = this->music;
-    this->music = NULL;
-    delete oldMusic;
-  }
-
-
-  PRINTF(0)("Setting Sound Track to %s\n", name.c_str());
+    delete this->music;
+  this->music = NULL;
 
   if (!name.empty())
@@ -369 +364 @@
     PRINTF(3)("Setting Sound Track to %s\n", name.c_str());
     std::string oggFile = ResourceManager::getFullName(name);
-    OggPlayer* newMusic = new OggPlayer(oggFile);
-    this->music = newMusic;
+    this->music = new OggPlayer(oggFile);
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);