Changeset 4332 in orxonox.OLD for orxonox/branches/physics/src/story_entities/world.h

Timestamp:

May 27, 2005, 7:14:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:

• orxonox/branches/physics/src/story_entities/world.h (modified) (2 diffs)

orxonox/branches/physics/src/story_entities/world.h

@@ -24 +24 @@
 class Text;
 class TiXmlElement;
+class PilotNode;
 
 //! The game world Interface
@@ -123 +124 @@
   tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
   WorldEntity* localPlayer;           //!< The Player, you fly through the level.
+  PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse
 
   GarbageCollector* garbageCollector; //!< reference to the garbage  collector