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

Timestamp:

Jan 21, 2006, 1:18:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:

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

trunk/src/defs/class_id.h

@@ -73 +73 @@
 
   CL_STORY_ENTITY               =    0x02000000,
+
+  CL_GAME_WORLD                 =    0x50000000,
+  CL_GAME_WORLD_DATA            =    0x60000000,
 
   CL_PHYSICS_INTERFACE          =    0x04000000,
@@ -96 +99 @@
   CL_PLAYER                     =    0x00202000,
   CL_NPC                        =    0x00204000,
+  CL_IMAGE_ENTITY               =    0x00206000,
+  CL_PLANET                     =    0x00207000,
   CL_PROJECTILE                 =    0x00208000,
   CL_WEAPON                     =    0x00210000,
@@ -148 +153 @@
   CL_CAMPAIGN                   =    0x00000101,
   CL_CAMPAIGN_DATA              =    0x00000102,
-  CL_GAME_WORLD                 =    0x00000103,
-  CL_GAME_WORLD_DATA            =    0x00000104,
+  CL_SIMPLE_GAME_MENU           =    0x00000103,
+  CL_SIMPLE_GAME_MENU_DATA      =    0x00000104,
   CL_SINGLE_PLAYER_WORLD        =    0x00000105,
   CL_SINGLE_PLAYER_WORLD_DATA   =    0x00000106,
@@ -155 +160 @@
   CL_MULTI_PLAYER_WORLD_DATA    =    0x00000108,
   CL_MOVIE_LOADER               =    0x00000109,
+
 
   // WorldEntities (range from 0x00000200 to 0x000004ff)