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

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/defs

Files:

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

trunk/src/defs/class_id.h

@@ -127 +127 @@
   CL_NETWORK_MANAGER            =    0x00000050,
   CL_SHARED_NETWORK_DATA        =    0x00000051,
+  CL_NETWORK_SETTINGS           =    0x00000052,
   CL_ATMOSPHERIC_ENGINE         =    0x00000061,
 
@@ -422 +423 @@
   CL_PLAYER_STATS               =    0x00000d09,
   CL_SIMPLE_SYNC                =    0x00000d0a,
+  CL_NETWORK_MONITOR            =    0x00000d0b,
 
 

trunk/src/defs/globals.h

@@ -47 +47 @@
 
 #define   CONFIG_NAME_FULLSCREEN           "Fullscreen-mode"
+#define   CONFIG_NAME_NO_RENDER            "Norender-mode"
 #define   CONFIG_NAME_RESOLUTION           "Resolution"
 #define   CONFIG_NAME_WIREFRAME            "WireFrame-mode"