Changeset 1064 for code/trunk/src/network

Timestamp:

Apr 14, 2008, 9:39:57 PM (17 years ago)

Author:

rgrieder

Message:

• replaced all String2Number with ConvertValue
• replaced all tokenize with SubString
• dealt with warnings under msvc
• removed some warnings by placing casts
• bugfix in audio: local variable pushed into member variable std::vector
• updated StableHeaders.h

Location:

code/trunk/src/network

Files:

• ConnectionManager.cc (modified) (3 diffs)
• GameStateManager.cc (modified) (1 diff)
• PacketDecoder.cc (modified) (1 diff)

code/trunk/src/network/ConnectionManager.cc

@@ -114 +114 @@
 
   bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer) {
-    if(enet_peer_send(peer, head_->findClient(&(peer->address))->getID() , packet)!=0)
+    if(enet_peer_send(peer, (enet_uint8)head_->findClient(&(peer->address))->getID() , packet)!=0)
       return false;
     return true;
@@ -120 +120 @@
 
   bool ConnectionManager::addPacket(ENetPacket *packet, int clientID) {
-    if(enet_peer_send(head_->findClient(clientID)->getPeer(), clientID, packet)!=0)
+    if(enet_peer_send(head_->findClient(clientID)->getPeer(), (enet_uint8)clientID, packet)!=0)
       return false;
     return true;
@@ -127 +127 @@
   bool ConnectionManager::addPacketAll(ENetPacket *packet) {
     for(ClientInformation *i=head_->next(); i!=0; i=i->next()){
-      if(enet_peer_send(i->getPeer(), i->getID(), packet)!=0)
+      if(enet_peer_send(i->getPeer(), (enet_uint8)i->getID(), packet)!=0)
         return false;
     }

code/trunk/src/network/GameStateManager.cc

@@ -133 +133 @@
       // run Synchronisable::getData with offset and additional place for 3 ints in between (for ids and length)
       sync=it->getData((retval->data)+offset+3*sizeof(int));
-      *(retval->data+offset)=sync.length;
-      *(retval->data+offset+sizeof(int))=sync.objectID;
-      *(retval->data+offset+2*sizeof(int))=sync.classID;
+      *(retval->data+offset)=(unsigned char)sync.length;
+      *(retval->data+offset+sizeof(int))=(unsigned char)sync.objectID;
+      *(retval->data+offset+2*sizeof(int))=(unsigned char)sync.classID;
       // increase data pointer
       offset+=tempsize+3*sizeof(int);

code/trunk/src/network/PacketDecoder.cc

@@ -153 +153 @@
     }
     //since it's not alowed to use void* for pointer arithmetic
+    //FIXME: variable never used
     unsigned char* data = (unsigned char *)(packet->data);
     //copy the GameStateCompressed id into the struct, which is located at second place data+sizeof( int )