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

Timestamp:

Nov 29, 2005, 11:07:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches world_entities to trunk again
merged with command
svn merge -r5795:HEAD branches/world_entities/ trunk/
no conflicts (what a wonder)

Location:

trunk/src/defs

Files:

• class_id.h (modified) (3 diffs)
• globals.h (modified) (2 diffs)
• stdincl.h (modified) (1 diff)

trunk/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

trunk/src/defs/globals.h

@@ -17 +17 @@
                         "Nico Bernold - Physics\n" \
                         "David Gruetter - The ProtoType\n" \
+                        "Aaron von Schroeder - Sensors\n" \
+                        "Lukas Grauer - Phasers\n" \
                         "many more...\n"
+
 #define   ORXONOX_WEBPAGE                  "http://www.orxonox.net"
 
@@ -90 +93 @@
 "any later version.\n"
 
+
+
 #define GNU_LICENCE_LONG \
 "                    GNU GENERAL PUBLIC LICENSE\n" \

trunk/src/defs/stdincl.h

@@ -17 +17 @@
 #endif
 
-#include <stdlibincl.h>
+#include "stdlibincl.h"
 
 #include "sdlincl.h"
 #include "glincl.h"
 
-#include "error.h"
-#include "globals.h"
-
 #include "compiler.h"