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

Timestamp:

Mar 30, 2006, 11:45:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

Location:

trunk/src/defs

Files:

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

trunk/src/defs/class_id.h

@@ -96 +96 @@
   CL_MASK_LOWLEVEL_CLASS        =    0x00000fff,
 
+  CL_PREFERENCES                =    0X00000f51,
 
   /// SINGLETON classes (range from 0x00000000 to 0x000000ff)

trunk/src/defs/globals.h

@@ -27 +27 @@
 #define   DEFAULT_DATA_DIR                 DATADIR "/orxonox/"
 #define   DEFAULT_DATA_DIR_CHECKFILE       "data.oxd"
+
+#define   DEFAULT_ORXONOX_PORT             9999
 
 // Defines all the Sections of the Config (in Gui and orxonox)