Changeset 2168 for code/branches/objecthierarchy/src/network

Timestamp:

Nov 9, 2008, 7:11:53 PM (16 years ago)

Author:

landauf

Message:

Split up LevelManager into LevelManager and PlayerManager where LevelManager handles all levels and is only active on the server, while PlayerManager handles client connections and passes new players to the LevelManager (if running on a server). If running on a client, PlayerManager just maps PlayerInfos with clientIDs.

Also added a small hack in Level.cc to show the ChatOverlay on clients.

File:

• code/branches/objecthierarchy/src/network/Synchronisable.cc (modified) (11 diffs)

code/branches/objecthierarchy/src/network/Synchronisable.cc

@@ -79 +79 @@
     classID = (unsigned int)-1;
     syncList = new std::list<synchronisableVariable *>;
-    
-    
+
+
 #ifndef NDEBUG
     ObjectList<Synchronisable>::iterator it;
@@ -173 +173 @@
       return 0;
     }
-    
+
     COUT(4) << "fabricating object with id: " << header->objectID << std::endl;
 
@@ -240 +240 @@
     if (it1 != objectMap_.end())
       return it1->second;
-    
+
     ObjectList<Synchronisable>::iterator it;
     for(it = ObjectList<Synchronisable>::begin(); it; ++it){
@@ -295 +295 @@
 #endif
   }
-  
+
   void Synchronisable::unregisterVariable(void *var){
     std::list<synchronisableVariable *>::iterator it = syncList->begin();
@@ -311 +311 @@
     // the variable has not been registered before
   }
-  
+
 
   /**
@@ -366 +366 @@
         continue;  // this variable should only be received
       }
-      
+
       // =========== start bidirectional stuff =============
       // if the variable gets synchronised bidirectional, then add the reference to the bytestream
@@ -397 +397 @@
       }
       // ================== end bidirectional stuff
-       
+
       switch((*i)->type){
         case DATA:
@@ -461 +461 @@
       bool callback=false;
       bool master=false;
-      
+
       if( ( (*i)->mode & direction::bidirectional ) == direction::bidirectional )
       {
@@ -505 +505 @@
         mem += sizeof((*i)->varReference);
       }
-      
+
       switch((*i)->type){
         case DATA:
@@ -525 +525 @@
           (*i)->size = *(size_t *)mem;
           mem += sizeof(size_t);
-          
+
           if( (*i)->callback) // check whether this string changed
             if( *static_cast<std::string*>((*i)->var) != std::string((char *)mem) )
@@ -535 +535 @@
               *static_cast<std::string*>((*i)->varBuffer)=*static_cast<std::string*>( (void*)(mem+sizeof(size_t)) );
           }
-          
+
           *((std::string *)((*i)->var)) = std::string((const char*)mem);
           COUT(5) << "synchronisable: char: " << (const char*)mem << " string: " << std::string((const char*)mem) << std::endl;