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

Timestamp:

Apr 25, 2006, 11:46:21 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor movement and renaming

File:

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

trunk/src/story_entities/game_world.cc

@@ -52 +52 @@
 #include "shell.h"
 
-#include "animation_player.h"
-#include "animation3d.h"
-
 #include "ogg_player.h"
 #include "shader.h"
+
+#include "animation_player.h"
 
 #include "game_rules.h"
@@ -125 +124 @@
   State::setCurrentStoryEntity(dynamic_cast<StoryEntity*>(this));
   this->dataTank->init();
+
+  /* initialize some engines and graphical elements */
+  AnimationPlayer::getInstance();
+  PhysicsEngine::getInstance();
+
 }
 
@@ -179 +183 @@
 ErrorMessage GameWorld::unloadData()
 {
+  PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
+
+  this->dataTank->unloadData();
+
   delete this->shell;
-  PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
-
-  this->dataTank->unloadData();
+  this->shell = NULL;
+  delete AnimationPlayer::getInstance();
+  delete PhysicsEngine::getInstance();
 
   State::setCurrentStoryEntity(NULL);