Changeset 5818 in orxonox.OLD for branches

Timestamp:

Nov 29, 2005, 10:57:06 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/we: font is now a texture.

Location:

branches/world_entities/src

Files:

• defs/class_id.h (modified) (3 diffs)
• story_entities/world.cc (modified) (1 diff)

branches/world_entities/src/defs/class_id.h

@@ -81 +81 @@
   CL_WEAPON                     =    0x00120000,
 
-  // subsuper-classes derivations taken : 1, 5, a, b.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
+  // subsuper-classes derivations taken : 1, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
 
   // lowest level classes
@@ -142 +142 @@
   CL_LASER                      =    0x00000242,
   CL_BOMB                       =    0x00000243,
-  CL_GROUND_TURRET              =    0x00000244,
+  CL_GROUND_TURRET              =    0x00000244,
   CL_GUIDED_MISSILE             =    0x00000245,
 
@@ -171 +171 @@
 
   // graphical stuff (range from 0x00000800 to 0x000009ff)
+  CL_TEXTURE                    =    0x00c01000,
   CL_TEXT                       =    0x00b01801,
-  CL_FONT                       =    0x00000802,
-  CL_TEXTURE                    =    0x00000803,
+  CL_FONT                       =    0x00c02802,
   CL_MATERIAL                   =    0x00000804,
   CL_MODEL                      =    0x00000805, //!< @todo make this a SUBCLASS maybe

branches/world_entities/src/story_entities/world.cc

@@ -1042 +1042 @@
 }
 
-
 void World::setPath( const char* name)
 {