Changeset 9406 in orxonox.OLD for trunk/src/lib/network/synchronizeable.h

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

File:

• trunk/src/lib/network/synchronizeable.h (modified) (6 diffs)

trunk/src/lib/network/synchronizeable.h

@@ -1 +1 @@
 /*!
  * @file synchronizeable.h
-    \brief interface for all classes that have to be synchronized
+ * @brief interface for all classes that have to be synchronized
  */
 
@@ -8 +8 @@
 
 #include "base_object.h"
-#include "netdefs.h"
-#include "converter.h"
-#include "vector.h"
-#include "quaternion.h"
+
 #include "synchronizeable_var/synchronizeable_var.h"
 #include "synchronizeable_var/synchronizeable_vector.h"
@@ -20 +17 @@
 #include "synchronizeable_var/synchronizeable_bool.h"
 #include "synchronizeable_var/synchronizeable_uint.h"
-
+#include "synchronizeable_var/synchronizeable_ip.h"
 
 #include <vector>
 #include <list>
 
-//State constants: They have to be of the form 2^n
-#define STATE_SERVER 1
 
 struct StateHistoryEntry
@@ -51 +46 @@
     virtual ~Synchronizeable();
 
-    void setIsServer( bool isServer );
-    bool isServer();
-
     virtual void varChangeHandler( std::list<int> & id );
 
@@ -61 +53 @@
     virtual void handleSentState( int userId, int stateId, int fromStateId );
     virtual void handleRecvState( int userId, int stateId, int fromStateId );
-    
+
     void registerVar( SynchronizeableVar * var );
     int registerVarId( SynchronizeableVar * var );
@@ -82 +74 @@
   protected:
     NetworkStream*    networkStream;  //!< reference network stream we are connected to
-    int               state;
+
 
   private: