Changeset 9470 in orxonox.OLD for branches/proxy/src/lib/network/shared_network_data.h

Timestamp:

Jul 25, 2006, 10:23:17 PM (18 years ago)

Author:

patrick

Message:

heavy permissions fight: no node was ever thought to be client and server at the same time, proxy server are hybrid nodes so there is need for a big framework extension.

• made the obb creation saver
• prevented segfaults in the aabb tree creation, this was very dangerous code
• inserted handshake hack to make the handshake work.

No I will have to get the handshake right so the node works correctly

File:

• branches/proxy/src/lib/network/shared_network_data.h (modified) (1 diff)

branches/proxy/src/lib/network/shared_network_data.h

@@ -28 +28 @@
 
     /** @returns the next uniqueID free for an object */
-    inline int getNewUniqueID() { return ( this->nodeType != NET_CLIENT)?this->newUniqueID++:-1; }
+    inline int getNewUniqueID() { return ( isMasterServer())?this->newUniqueID++:-1; }
     /** sets the @param newUniqueID: the new offset for the next unique id */
     inline void setNewUniqueID(int newUniqueID) { this->newUniqueID = newUniqueID; }