Changeset 5915 in orxonox.OLD for trunk/src/story_entities/world.h

Timestamp:

Dec 4, 2005, 3:34:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/spaceshipControll back to the trunk:
merged with command:
svn merge -r5835:HEAD branches/spaceshipcontroll trunk
conflicts resolved with dynamic indentation methodology algorithms

File:

• trunk/src/story_entities/world.h (modified) (3 diffs)

trunk/src/story_entities/world.h

@@ -16 +16 @@
 class Camera;
 class Player;
-class PNode;
 class GLMenuImageScreen;
 class Terrain;
@@ -22 +21 @@
 class Text;
 class TiXmlElement;
-class PilotNode;
 
 class Shell;
@@ -121 +119 @@
     tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
     Player* localPlayer;                //!< The Player, you fly through the level.
-    PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse
-
-
 };