Changeset 5955 in orxonox.OLD for branches/powerups/src/story_entities/world.h

Timestamp:

Dec 7, 2005, 1:05:10 PM (18 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

File:

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

branches/powerups/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
-
-
 };