Changeset 6634 in orxonox.OLD for trunk/src/lib/network/network_stream.h

Timestamp:

Jan 21, 2006, 1:18:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:

• trunk/src/lib/network/network_stream.h (modified) (1 diff)

trunk/src/lib/network/network_stream.h

@@ -55 +55 @@
     inline int getSyncCount(){ return synchronizeables.size(); }
 
+    inline bool isUserIdActive( int userID ) { if (userID>=networkSockets.size()) return false; else return networkSockets[userID]!=NULL; }
+
   private:
     NetworkProtocol*       networkProtocol;