Changeset 2355 for code/branches/network64/src/network/synchronisable

Timestamp:

Dec 8, 2008, 8:36:27 PM (16 years ago)

Author:

scheusso

Message:

merged network branch to network64 branch
not everything working yet (trafficcontrol)

Location:

code/branches/network64/src/network/synchronisable

Files:

• Synchronisable.cc (modified) (1 diff)
• Synchronisable.h (modified) (3 diffs)

code/branches/network64/src/network/synchronisable/Synchronisable.cc

@@ -53 +53 @@
 namespace orxonox
 {
-
 
   std::map<uint32_t, Synchronisable *> Synchronisable::objectMap_;

code/branches/network64/src/network/synchronisable/Synchronisable.h

@@ -53 +53 @@
 namespace orxonox
 {
-  static const uint32_t OBJECTID_UNKNOWN = static_cast<uint32_t>(-1);
 
   namespace objectDirection{
@@ -92 +91 @@
 
     inline uint32_t getObjectID(){return objectID;}
+    inline unsigned int getCreatorID(){return creatorID;}
     inline uint32_t getClassID(){return classID;}
+    inline unsigned int getPriority(){ return objectFrequency_;}
+
   protected:
     Synchronisable(BaseObject* creator);
@@ -99 +101 @@
     template <class T> void unregisterVariable(T& var);
     void setObjectMode(uint8_t mode);
-    void setObjectFrequency(unsigned int freq){ objectFrequency_ = freq; }
+    void setObjectPriority(unsigned int freq){ objectFrequency_ = freq; }