Changeset 6273 in orxonox.OLD for branches/network/src/lib/network/synchronizeable.h

Timestamp:

Dec 23, 2005, 5:30:22 PM (18 years ago)

Author:

rennerc

Message:

converter: added functions for strings
network_protocol: length and id are now int
network_game_manager: fixed some more bugs
skybox: is loaded on client corectly now

File:

• branches/network/src/lib/network/synchronizeable.h (modified) (4 diffs)

branches/network/src/lib/network/synchronizeable.h

@@ -9 +9 @@
 #include "base_object.h"
 #include "netdefs.h"
+#include "converter.h"
 
 
@@ -18 +19 @@
 #define STATE_SERVER 1
 #define STATE_OUTOFSYNC 2
+#define STATE_REQUESTEDSYNC 4
+
+//macros to help writing data in byte buffer
+#define SYNCHELP_WRITE_BEGIN() {  int __synchelp_write_i = 0; \
+                                  bool __synchelp_write_err = false; \
+                                  int __synchelp_write_n; }
+#define SYNCHELP_WRITE_RESET() { __synchelp_write_i = 0; __synchelp_write_err = false; }
+#define SYNCHELP_WRITE_INT(i) { __synchelp_write_n =  }
+#define SYNCHELP_WIRTE_FLOAT()
+#define SYNCHELP_WRITE_BYTE()
+#define SYNCHELP_WRITE_STRING()
 
 class NetworkStream;
@@ -35 +47 @@
     void setIsServer( bool isServer );
     void setIsOutOfSync( bool outOfSync );
+    void setRequestedSync( bool requestedSync );
     bool isServer();
     bool isOutOfSync();
-    void setUniqueID( int id ){ uniqueID = id; }
-    int  getUniqueID() const { return uniqueID; };
-    void requestSync( int hostID ){ this->synchronizeRequests.push_back( hostID ); }
+    bool requestedSync();
+    inline void setUniqueID( int id ){ uniqueID = id; }
+    inline int  getUniqueID() const { return uniqueID; };
+    inline void requestSync( int hostID ){ this->synchronizeRequests.push_back( hostID ); }
+    inline int getRequestSync( void ){ if ( this->synchronizeRequests.size()>0 ){ int n = *(synchronizeRequests.begin()); synchronizeRequests.pop_front(); return n; } else { return -1; } };
+    inline int getHostID() { return this->hostID; }
 
     inline int getOwner(){ return owner; }
@@ -55 +71 @@
     int owner;
     int hostID;
-    int state;
+
     std::list<int> synchronizeRequests;
 
   protected:
     NetworkStream* networkStream;
+    int state;
 
   };