Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/world.h

Timestamp:

Mar 1, 2005, 9:50:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/world.h (modified) (2 diffs)

orxonox/branches/trackManager/src/world.h

@@ -16 +16 @@
 class PNode;
 class GLMenuImageScreen;
+class Skysphere;
 
 //! The game environment
@@ -74 +75 @@
   GLuint objectList;
   SDL_Surface *loadImage;
+  Skysphere* skySphere;
 
   WorldEntity* localPlayer;