Changeset 10013 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Dec 4, 2006, 6:42:46 PM (18 years ago)

Author:

patrick

Message:

merged the collision reaction branche back to trunk

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (3 diffs)
• game_world_data.cc (modified) (1 diff)

trunk/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();
 }
 

trunk/src/story_entities/game_world_data.cc

@@ -232 +232 @@
   State::setPlayer(this->localPlayer);
 
-  Playable* playable;
   if (!Playable::objectList().empty())
   {