Changeset 1712 for code/branches

Timestamp:

Sep 6, 2008, 1:39:51 PM (16 years ago)

Author:

scheusso

Message:

enet callback disabled

Location:

code/branches/network/src/network

Files:

• GamestateClient.cc (modified) (2 diffs)
• GamestateClient.h (modified) (1 diff)
• GamestateManager.cc (modified) (2 diffs)
• GamestateManager.h (modified) (1 diff)
• Server.cc (modified) (2 diffs)
• packet/Chat.cc (modified) (1 diff)
• packet/ClassID.cc (modified) (1 diff)
• packet/Gamestate.cc (modified) (5 diffs)
• packet/Gamestate.h (modified) (1 diff)
• packet/Packet.cc (modified) (3 diffs)

code/branches/network/src/network/GamestateClient.cc

@@ -74 +74 @@
     int id = GAMESTATEID_INITIAL;
     bool b = saveShipCache();
-    if(tempGamestate_->spreadData()){
+    if(processGamestate(tempGamestate_)){
       if(b)
         loadShipCache();
@@ -151 +151 @@
   }
 
+  bool GamestateClient::processGamestate(packet::Gamestate *gs){
+    assert(gs->decompressData());
+    if(gs->isDiffed())
+      assert(gs->undiff(gamestateMap_[gs->getBaseID()]));
+    return gs->spreadData();
+  }
 
 }

code/branches/network/src/network/GamestateClient.h

@@ -66 +66 @@
     void cleanup();
   private:
+    bool processGamestate(packet::Gamestate *gs);
     void removeObject(orxonox::Iterator<Synchronisable> &it);
     void printGamestateMap();

code/branches/network/src/network/GamestateManager.cc

@@ -81 +81 @@
     // now push only the most recent gamestates we received (ignore obsolete ones)
     for(it = gamestateQueue.begin(); it!=gamestateQueue.end(); it++){
-      it->second->spreadData();
+      assert(processGamestate(it->second));
       delete it->second;
     }
@@ -197 +197 @@
     ClientInformation::removeClient(client->getID());
   }
+  
+  bool GamestateManager::processGamestate(packet::Gamestate *gs){
+    assert(gs->decompressData());
+    assert(!gs->isDiffed());
+    return gs->spreadData();
+  }
 
 }

code/branches/network/src/network/GamestateManager.h

@@ -82 +82 @@
     private:
     void cleanup(); // "garbage handler"
-
+    bool processGamestate(packet::Gamestate *gs);
+    
     std::map<int, packet::Gamestate*> gamestateMap; //map gsID to gamestate*
     std::map<int, int> gamestateUsed; // save the number of clients, that use the specific gamestate

code/branches/network/src/network/Server.cc

@@ -131 +131 @@
   bool Server::sendChat(packet::Chat *chat) {
     //TODO: change this (no informations about who wrote a message)
+    assert(0);
     ClientInformation *temp = ClientInformation::getBegin();
     while(temp){
@@ -321 +322 @@
     w->setClientID(temp->getID());
     assert(w->send());
-    delete w;
     return true;
   }

code/branches/network/src/network/packet/Chat.cc

@@ -44 +44 @@
   messageLength_ = message.length()+1;
   data_=new unsigned char[ getSize() ];
-  *(ENUM::Type *)&data_[ _PACKETID ] = packet::ENUM::Chat;
+  *(ENUM::Type *)&data_[ _PACKETID ] = ENUM::Chat;
   *(unsigned int *)&data_[ _MESSAGELENGTH ] = messageLength_;
   memcpy( &data_[ _MESSAGE ], (void *)message.c_str(), messageLength_ );

code/branches/network/src/network/packet/ClassID.cc

@@ -51 +51 @@
   data_=new unsigned char[ getSize() ];
   assert(data_);
-  *(packet::ENUM::Type *)&data_[ _PACKETID ] = packet::ENUM::ClassID;
+  *(ENUM::Type *)&data_[ _PACKETID ] = ENUM::ClassID;
   *(unsigned int *)&data_[ _CLASSID ] = classID;
   *(unsigned int *)&data_[ _CLASSNAMELENGTH ] = classNameLength_;

code/branches/network/src/network/packet/Gamestate.cc

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -124 +106 @@
   //start write gamestate header
   HEADER->packetType = ENUM::Gamestate;
+  assert( *(ENUM::Type *)&data_[ 0 ] == ENUM::Gamestate);
   HEADER->normsize = currentsize;
   HEADER->id = id;
@@ -230 +213 @@
 bool Gamestate::decompressData()
 {
+  assert(compressed_);
   //COUT(4) << "GameStateClient: uncompressing gamestate. id: " << a->id << ", baseid: " << a->base_id << ", normsize: " << a->normsize << ", compsize: " << a->compsize << std::endl;
   int normsize = HEADER->normsize;
@@ -256 +240 @@
   *GAMESTATE_HEADER(ndata) = *HEADER;
   //delete old (compressed data)
-  delete []data_;
+  delete[] data_;
   //set new pointers and create bytestream
   data_ = ndata;
@@ -349 +333 @@
   }
 
-}
-
-}
+  bool Gamestate::isDiffed(){
+    return HEADER->diffed;
+  }
+  
+  int Gamestate::getBaseID(){
+    return HEADER->base_id;
+  }
+}
+
+}

code/branches/network/src/network/packet/Gamestate.h

@@ -62 +62 @@
     bool spreadData(int mode=0x0);
     int getID();
+    bool isDiffed();
+    int getBaseID();
     Gamestate *diff(Gamestate *base);
     Gamestate *undiff(Gamestate *base);

code/branches/network/src/network/packet/Packet.cc

@@ -60 +60 @@
 }
 
+void blub(ENetPacket *packet){
+  COUT(0) << "blubb" << std::endl;
+}
+
 Packet::Packet(unsigned char *data, int clientID){
   flags_ = PACKET_FLAG_DEFAULT;
@@ -73 +77 @@
   clientID_ = ClientInformation::findClient(&peer->address)->getID();
   data_ = packet->data;
-  enet_packet_destroy(packet);
 }
 
 Packet::Packet(const Packet &p){
+  enetPacket_=p.enetPacket_;
   flags_=p.flags_;
   if(p.data_){
@@ -93 +97 @@
 
 bool Packet::send(){
-  if(packetDirection_ != ENUM::Outgoing && packetDirection_ != ENUM::Bidirectional )
+  /*if(packetDirection_ != ENUM::Outgoing && packetDirection_ != ENUM::Bidirectional ){
+    assert(0);
     return false;
+  }*/
   if(!enetPacket_){
-    if(!data_)
+    if(!data_){
+      assert(0);
       return false;
+    }
     enetPacket_ = enet_packet_create(getData(), getSize(), getFlags());
-    enetPacket_->freeCallback = &Packet::deletePacket;
+    enetPacket_->freeCallback = &blub;
     packetMap_[enetPacket_] = this;
   }