Changeset 3433 in orxonox.OLD for orxonox/trunk/src/world.h

Timestamp:

Mar 1, 2005, 2:36:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged back the trackManager to the trunk.
merged with command:
svn merge -r 3369:HEAD branches/trackManager trunk
resolved conflicts in world.cc additive differences.

File:

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

orxonox/trunk/src/world.h

@@ -12 +12 @@
 
 class TrackManager;
-class Track;
 class WorldEntity;
 class Camera;
@@ -49 +48 @@
   virtual void releaseLoadScreen();
   
-  void setTrackLen (Uint32 tracklen);
-  int getTrackLen ();
   //bool system_command (Command* cmd);
   Camera* getCamera ();
@@ -61 +58 @@
   // base level data
   TrackManager* trackManager;
-  Track* track;
-  Uint32 tracklen;   // number of Tracks the World consist of
   Vector* pathnodes;
   Camera* localCamera;