Changeset 2533 for code/branches/bugger/src/network/NetworkPrereqs.h

Timestamp:

Dec 23, 2008, 11:34:35 PM (15 years ago)

Author:

rgrieder

Message:

Merged revisions 2384-2436 from presentation branch to bugger.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/network/NetworkPrereqs.h (modified) (3 diffs)

code/branches/bugger/src/network/NetworkPrereqs.h

@@ -61 +61 @@
 #include "util/Integers.h"
 
+//-----------------------------------------------------------------------
+// Library global contants
+//-----------------------------------------------------------------------
+namespace orxonox
+{
+  static const unsigned int GAMESTATEID_INITIAL = (unsigned int)-1;
+  static const unsigned int CLIENTID_UNKNOWN    = (unsigned int)-2;
+  static const uint32_t     OBJECTID_UNKNOWN    = (uint32_t)(-1);
+}
 
 //-----------------------------------------------------------------------
@@ -67 +76 @@
 namespace orxonox
 {
-
-// Constants definition
-
-  static const unsigned int GAMESTATEID_INITIAL = (unsigned int)-1;
-  static const unsigned int CLIENTID_UNKNOWN = (unsigned int)-2;
-  static const uint32_t OBJECTID_UNKNOWN = static_cast<uint32_t>(-1);
-  static const unsigned int SCHED_PRIORITY_OFFSET = -5;
-
-  
-
-  
   class Client;
   class ClientConnection;
@@ -103 +101 @@
   class obj;
   class objInfo;
-  namespace packet{
+
+  namespace packet
+  {
     class Gamestate;
     class Packet;