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

Timestamp:

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

Author:

bensch

Message:

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

File:

• trunk/src/story_entities/game_world.cc (modified) (13 diffs)

trunk/src/story_entities/game_world.cc

@@ -20 +20 @@
 #include "game_world_data.h"
 
+#include "util/loading/resource_manager.h"
 #include "state.h"
 #include "class_list.h"
@@ -26 +27 @@
 #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 "md2Model.h"
+#include "world_entities/projectiles/projectile.h"
+#include "npcs/npc_test1.h"
 #include "playable.h"
 
@@ -40 +47 @@
 #include "shell_command.h"
 
-#include "util/loading/resource_manager.h"
 #include "graphics_engine.h"
 #include "event_handler.h"
@@ -47 +53 @@
 #include "network_manager.h"
 #include "physics_engine.h"
+#include "fields.h"
 
 #include "glmenu_imagescreen.h"
@@ -96 +103 @@
   PRINTF(4)("Deleted GameWorld\n");
 
-  this->bRunning = false;
-  this->unloadData();
-
-  if( this->dataTank)
-    delete this->dataTank;
+  if (this->audioThread != NULL)
+    SDL_KillThread(this->audioThread);
 }
 
@@ -136 +140 @@
   GameWorld* gw = (GameWorld*)gameWorld;
   printf("STARTIG AUDIO THREAD\n");
-  if(gw->dataTank != NULL && gw->dataTank->music != NULL)
-    gw->dataTank->music->playback();
-  SDL_Delay(100);
   while (gw->bRunning)
   {
-    printf("PLAYBACK\n");
-    ClassList::debug(3, CL_SOUND_OGG_PLAYER);
-    if(gw->dataTank != NULL && gw->dataTank->music != NULL)
-      gw->dataTank->music->update();
+    if(gw->dataTank->music != NULL)
+      gw->dataTank->music->playback();
     SDL_Delay(5);
   }
-  printf("END the AudioThread\n");
+  printf("End the AudioThread\n");
 }
 
@@ -169 +168 @@
   }
 
-  TiXmlDocument XMLDoc = TiXmlDocument( getLoadFile());
+  TiXmlDocument* XMLDoc = new TiXmlDocument( getLoadFile());
   // load the xml world file for further loading
-  if( !XMLDoc.LoadFile())
-  {
-    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc.ErrorDesc(), this->getLoadFile().c_str(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+  if( !XMLDoc->LoadFile())
+  {
+    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getLoadFile().c_str(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+    delete XMLDoc;
     return (ErrorMessage){213,"XML File parsing error","GameWorld::load()"};
   }
   // check basic validity
-  TiXmlElement* root = XMLDoc.RootElement();
+  TiXmlElement* root = XMLDoc->RootElement();
   assert( root != NULL);
   if( root == NULL || root->Value() == NULL || strcmp( root->Value(), "WorldDataFile"))
@@ -183 +183 @@
     // report an error
     PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
+    delete XMLDoc;
     return (ErrorMessage){213,"Path not a WorldDataFile","GameWorld::load()"};
   }
@@ -189 +190 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
+  delete XMLDoc;
   this->releaseLoadScreen();
 }
@@ -199 +201 @@
 {
   delete this->shell;
-  this->shell = NULL;
-  PRINTF(0)("GameWorld::~unloadData() - unloading the current GameWorld %s::%s\n", this->getClassName(), this->getName());
-
-  if (this->audioThread != NULL)
-  {
-    this->bRunning = false;
-    SDL_WaitThread(this->audioThread, NULL);
-    this->audioThread = NULL;
-  }
-
-  ClassList::debug( 3, CL_GAME_WORLD_DATA);
+  PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
 
   this->dataTank->unloadData();
@@ -215 +207 @@
   State::setCurrentStoryEntity(NULL);
   if (this->dataXML)
-  {
     delete this->dataXML;
-    this->dataXML = NULL;
-  }
 }
 
@@ -244 +233 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   this->bRunning = false;
+
+//  SDL_KillThread(this->audioThread);
+  this->audioThread = NULL;
 }
 
@@ -404 +396 @@
   PNode::getNullParent()->updateNode (this->dtS);
   SoundEngine::getInstance()->update();
+
+  if (this->dataTank->music != NULL)
+    this->dataTank->music->update();
 }