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

Timestamp:

Apr 13, 2005, 12:33:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

File:

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

orxonox/trunk/src/story_entities/world.h

@@ -21 +21 @@
 class Skysphere;
 class LightManager;
-class FontSet;
 class Terrain;
 class GarbageCollector;
 class SimpleAnimation;
+
+class Text;
 
 //! The game world Interface
@@ -96 +97 @@
   bool bPause;                        //!< pause mode
 
-  FontSet* testFont;                  //!< A test Font. \todo fix this, so it is for real.
   GLMenuImageScreen* glmis;           //!< The Level-Loader Display
+
+  Text* testText;                     //!< A text to Test the TextEngine;
 
   char* worldName;                    //!< The name of this World