Changeset 10010 in orxonox.OLD for branches/coll_rect.merge/src/story_entities/game_world.cc

Timestamp:

Dec 4, 2006, 4:39:45 PM (17 years ago)

Author:

patrick

Message:

merged the temp branch

File:

• branches/coll_rect.merge/src/story_entities/game_world.cc (modified) (3 diffs)

branches/coll_rect.merge/src/story_entities/game_world.cc

@@ -136 +136 @@
   AnimationPlayer::getInstance();
   PhysicsEngine::getInstance();
-  CREngine::getInstance();
+  CoRe::CREngine::getInstance();
 
   State::setScriptManager(&this->scriptManager);
@@ -219 +219 @@
   delete AnimationPlayer::getInstance();
   delete PhysicsEngine::getInstance();
-  delete CREngine::getInstance();
+  delete CoRe::CREngine::getInstance();
 
   State::setCurrentStoryEntity(NULL);
@@ -494 +494 @@
 void GameWorld::collisionReaction()
 {
-  CREngine::getInstance()->handleCollisions();
+  CoRe::CREngine::getInstance()->handleCollisions();
 }