Changeset 8706 for code/trunk/src/libraries/network

Timestamp:

Jun 14, 2011, 8:53:28 PM (13 years ago)

Author:

dafrick

Message:

Merging presentation branch back into trunk.
There are many new features and also a lot of other changes and bugfixes, if you want to know, digg through the svn log.
Not everything is yet working as it should, but it should be fairly stable. If you habe any bug reports, just send me an email.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/network/LANDiscovery.cc (modified) (2 diffs)
• src/libraries/network/Server.cc (modified) (1 diff)
• src/libraries/network/packet/Welcome.cc (modified) (1 diff)
• src/libraries/network/packet/Welcome.h (modified) (1 diff)
• src/libraries/network/synchronisable/Serialise.h (modified) (1 diff)
• src/libraries/network/synchronisable/Synchronisable.cc (modified) (2 diffs)
• src/libraries/network/synchronisable/Synchronisable.h (modified) (1 diff)

code/trunk/src/libraries/network/LANDiscovery.cc

@@ -38 +38 @@
 namespace orxonox
 {
-  ManageScopedSingleton(LANDiscovery, ScopeID::Root, true);
+  ManageScopedSingleton(LANDiscovery, ScopeID::Graphics, true);
 
   LANDiscovery::LANDiscovery()
@@ -49 +49 @@
   LANDiscovery::~LANDiscovery()
   {
-    enet_host_destroy(this->host_);
+    if (this->host_ != NULL)
+      enet_host_destroy(this->host_);
   }
 

code/trunk/src/libraries/network/Server.cc

@@ -413 +413 @@
     
     COUT(4) << "sending welcome" << std::endl;
-    packet::Welcome *w = new packet::Welcome(clientID, OBJECTID_UNKNOWN);
+    packet::Welcome *w = new packet::Welcome(clientID);
     w->setPeerID(clientID);
     b = w->send( static_cast<Host*>(this) );

code/trunk/src/libraries/network/packet/Welcome.cc

@@ -44 +44 @@
 #define _ENDIANTEST           _CLIENTID + sizeof(uint32_t)
 
-  Welcome::Welcome( uint32_t clientID, uint32_t shipID )
+  Welcome::Welcome( uint32_t clientID )
  : Packet()
 {

code/trunk/src/libraries/network/packet/Welcome.h

@@ -41 +41 @@
 {
 public:
-  Welcome( uint32_t clientID, uint32_t shipID );
+  Welcome( uint32_t clientID );
   Welcome( uint8_t* data, uint32_t clientID );
   virtual ~Welcome();

code/trunk/src/libraries/network/synchronisable/Serialise.h

@@ -84 +84 @@
 
     /** @brief returns the size of the objectID needed to synchronise the pointer */
-    template <class T> inline uint32_t returnSize( const SmartPtr<T>& variable )
+    template <class T> inline uint32_t returnSize( const SmartPtr<T>& )
     {
         return sizeof(uint32_t);

code/trunk/src/libraries/network/synchronisable/Synchronisable.cc

@@ -383 +383 @@
   /**
    * This function determines, wheter the object should be saved to the bytestream (according to its syncmode/direction)
-   * @param id gamestate id
    * @param mode Synchronisation mode (toclient, toserver or bidirectional)
    * @return true/false
@@ -397 +396 @@
   /**
    * This function determines, wheter the object should accept data from the bytestream (according to its syncmode/direction)
-   * @param id gamestate id
    * @param mode Synchronisation mode (toclient, toserver or bidirectional)
    * @return true/false

code/trunk/src/libraries/network/synchronisable/Synchronisable.h

@@ -50 +50 @@
   namespace ObjectDirection{
     enum Value{
+      None=0x0,
       ToClient=0x1,
       ToServer=0x2,