Changeset 6772 in orxonox.OLD for trunk/src/defs

Timestamp:

Jan 26, 2006, 2:44:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche network back
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6755:HEAD

absolutely no conficts

File:

• trunk/src/defs/class_id.h (modified) (2 diffs)

trunk/src/defs/class_id.h

@@ -74 +74 @@
   CL_STORY_ENTITY               =    0x02000000,
 
+  CL_PHYSICS_INTERFACE          =    0x04000000,
+
+  CL_EVENT_LISTENER             =    0x08000000,
+
+  CL_ELEMENT_2D                 =    0x10000000,
+
+  CL_SYNCHRONIZEABLE            =    0x20000000,
+
+  CL_WORLD_ENTITY               =    0x40000000,
+
   CL_GAME_WORLD                 =    0x50000000,
   CL_GAME_WORLD_DATA            =    0x60000000,
 
-  CL_PHYSICS_INTERFACE          =    0x04000000,
-
-  CL_EVENT_LISTENER             =    0x08000000,
-
-  CL_ELEMENT_2D                 =    0x10000000,
-
-  CL_SYNCHRONIZEABLE            =    0x20000000,
-
-  CL_WORLD_ENTITY               =    0x40000000,
+  CL_GRAPHICS_EFFECT            =    0x70000000,
+
 
   // subsuper-classes derivations taken : 1, 2, 3, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
@@ -258 +261 @@
   CL_ENVIRONMENT                =    0x00000821,
   CL_SHADER                     =    0x00000822,
+  CL_FOG_EFFECT                 =    0x70000001,
+
   // GL-GUI
   CL_GLGUI_WIDGET               =    0x00500000,