Changeset 6326 in orxonox.OLD

Timestamp:

Dec 28, 2005, 2:13:57 AM (18 years ago)

Author:

rennerc

Message:

 

Location:

branches/network/src

Files:

• lib/network/converter.cc (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (3 diffs)
• lib/network/network_stream.cc (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

branches/network/src/lib/network/converter.cc

@@ -461 +461 @@
  * @return: the number of read bytes in byte array
  */
-int Converter::byteArrayToStringM( const byte * a, char * & s )
+int Converter::byteArrayToStringM( const byte * a, char*& s )
 {
   int length;

branches/network/src/lib/network/network_game_manager.cc

@@ -384 +384 @@
 
   // -2 because you must not send network_game_manager and handshake
-  if ( !writeToClientBuffer( outBuffer[userID], networkStream->getSyncCount()-2 ) )
+  if ( !writeToClientBuffer( outBuffer[userID], networkStream->getSyncCount() ) )
     return;
 
@@ -391 +391 @@
   while ( it != e )
   {
-    if ( (*it)->getLeafID() != CL_NETWORK_GAME_MANAGER && (*it)->getLeafID() != CL_HANDSHAKE )
-    {
-
-      if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getLeafID()) ) )
-        return;
-
+
+    if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getLeafID()) ) )
+      return;
       //PRINTF(0)("SendEntityList: ClassID = %x\n", (*it)->getRealClassID());
 
-      if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getUniqueID()) ) )
-        return;
-
-      if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getOwner()) ) )
-        return;
-    }
+    if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getUniqueID()) ) )
+      return;
+
+    if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getOwner()) ) )
+      return;
 
     it++;
   }
+
+
 }
 
@@ -695 +693 @@
     i += Converter::byteArrayToInt( &data[i], &owner );
 
-    doCreateEntity( (ClassID)classID, uniqueID, owner );
+    if ( classID != CL_NETWORK_GAME_MANAGER && classID != CL_HANDSHAKE )
+      doCreateEntity( (ClassID)classID, uniqueID, owner );
 
   }

branches/network/src/lib/network/network_stream.cc

@@ -233 +233 @@
         if ( header->synchronizeableID < this->maxConnections+2 )
         {
-          if ( !isServer() ) PRINTF(0)("RESET UNIQUEID FROM %d TO 0 maxCon=%d\n", header->synchronizeableID, this->maxConnections);
+          //if ( !isServer() ) PRINTF(0)("RESET UNIQUEID FROM %d TO 0 maxCon=%d\n", header->synchronizeableID, this->maxConnections);
           header->synchronizeableID = 0;
         }
         else
         {
-          if ( !isServer() ) PRINTF(0)("UNIQUEID=%d\n", header->synchronizeableID);
+          //if ( !isServer() ) PRINTF(0)("UNIQUEID=%d\n", header->synchronizeableID);
         }
 

branches/network/src/lib/sound/sound_engine.cc

@@ -288 +288 @@
   // INITIALIZING THE DEVICE:
 
-#ifdef AL_VERSION_1_1
+#ifndef AL_VERSION_1_1
   ALCchar deviceName[] =
 

branches/network/src/world_entities/skybox.cc

@@ -218 +218 @@
   setIsOutOfSync( false );
 
-  /*int flsize = Converter::byteArrayToFloat( data, &size );
-  Converter::byteArrayToString( data+flsize, textureName, length-flsize );*/
-
   SYNCHELP_READ_BEGIN();
-  SYNCHELP_READ_FLOAT(size);
+  SYNCHELP_READ_FLOAT( size );
   SYNCHELP_READ_STRING( textureName, 1024 );
 
-  //PRINT(0)("GOT DATA: size=%f texture=%s\n", size, textureName);
+  PRINT(0)("GOT DATA: size=%f texture='%s'\n", size, textureName);
 
   this->setSize( size );
-  this->setTexture( textureName );
+  this->setTextureAndType( textureName, "jpg" );
   this->rebuild();
 }
@@ -245 +242 @@
   if ( rec > 0 )
   {
+    PRINT(0)("SEND DATA: size=%f texture='%s'\n", size, textureName);
     *reciever = rec;
 

branches/network/src/world_entities/world_entity.cc

@@ -349 +349 @@
     loadModel( modelFileName );
   }
-  delete[] modelFileName;
+  //delete []modelFileName;
 }