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

Timestamp:

Jun 15, 2006, 9:34:48 PM (19 years ago)

Author:

patrick

Message:

merged the bsp branche back to trunk

Location:

trunk/src/defs

Files:

• class_id.h (modified) (7 diffs)
• include_paths.am (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -119 +119 @@
   CL_STATE                      =    0x00000013,
   CL_FRAMEWORK                  =    0x00000014,
-  CL_CR_ENGINE                  =    0x00000015,                ///FIXME bensch i just added this id, verify if this is ok :D
+  CL_CR_ENGINE                  =    0x00000015,
   CL_RENDER_2D                  =    0x00000021,
   CL_NULL_ELEMENT_2D            =    0x00000022,
@@ -191 +191 @@
   CL_TURBINE_HOVER              =    0x0000035f,
   CL_SPECTATOR                  =    0x00000360,
+  CL_COLLISION_PROBE            =    0x00000361,
 
   // Powerups
@@ -258 +259 @@
 
   /// Collision
-  CL_COLLISION                  =    0x00000711,
+  CL_COLLISION                  =    0x00780000,
   CL_COLLISION_HANDLE           =    0x00000712,
   CL_COLLISION_REACTION         =    0X00000713,
@@ -264 +265 @@
   CL_CR_PHYSICS_GROUND          =    0X00000715,
   CL_CR_PHYSICS_GROUND_WALK     =    0X00000716,
-  CL_CR_OBJECT_DAMAGE          =    0X00000717,
+  CL_CR_OBJECT_DAMAGE           =    0X00000717,
   CL_CR_OBJECT_PICKUP           =    0X00000718,
   CL_CR_VERTEX_TRAFO            =    0X00000719,
@@ -277 +278 @@
   CL_OBB                        =    0x00720000,
   CL_BOUNDING_SPHERE            =    0x00740000,
-  
+
 
 
@@ -296 +297 @@
   CL_STATIC_MODEL               =    0x00902000,
   CL_VERTEX_ARRAY_MODEL         =    0x00904000,
+  CL_INTERACTIVE_MODEL          =    0x00908000,        ///FIXME: is this ok bensch?
 
   // Models
@@ -304 +306 @@
   CL_HEIGHT_MAP                 =    0x0000090a,
   CL_GRID                       =    0x0000090b,
-  CL_BSP_MODEL                  =    0x0000090c, //!FIXME 
-  
+  CL_BSP_MODEL                  =    0x0000090c, //!FIXME
+
   CL_MATERIAL                   =    0x00000810,
   CL_SHADER                     =    0x00000811,

trunk/src/defs/include_paths.am

@@ -7 +7 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/event
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/md2
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/md3
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/text_engine
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer