Changeset 1106210 in network-game

Timestamp:

Dec 30, 2012, 6:33:03 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

3535088

Parents:

092817a

Message:

Changed the player serialization code

Files:

• common/Player.cpp (modified) (2 diffs)
• server/server.cpp (modified) (4 diffs)

common/Player.cpp

@@ -53 +53 @@
    ostringstream oss;
 
+   cout << "Player name: " << this->name << endl;
+
+   /*
    oss.write((char*)&(this->id), sizeof(int));
    oss << this->name;
+   cout << "first oss str: " << oss.str() << endl;
    oss.write("\0", 1);
+   cout << "second oss str: " << oss.str() << endl;
    oss.write((char*)&(this->pos.x), sizeof(int));
+   cout << "third oss str: " << oss.str() << endl;
    oss.write((char*)&(this->pos.y), sizeof(int));
+   */
 
-   memcpy(buffer, oss.str().c_str(), this->name.length()+1+2*sizeof(int));
+   oss << this->id;
+   oss << this->name;
+   css << this->pos.x;
+   css << this->pos.y;
+
+   memcpy(buffer, oss.str().c_str(), oss.str().length);
 }
 
@@ -67 +79 @@
    iss.str(buffer);
 
+   /*
    iss.read((char*)&(this->id), sizeof(int));
    iss >> this->name;
    iss.read((char*)&(this->pos.x), sizeof(int));
    iss.read((char*)&(this->pos.y), sizeof(int));
+   */
+
+   iss >> this.id;
+   iss >> this->name;
+   iss >> this->pos.x;
+   iss >> this->pos.y;
 }
 

server/server.cpp

@@ -32 +32 @@
 bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, map<unsigned int, Player>& mapPlayers, unsigned int& unusedId, NETWORK_MSG &serverMsg);
 
-void updateUnusedId(unsigned int& id);
+void updateUnusedId(unsigned int& id, map<unsigned int, Player>& mapPlayers);
 
 // this should probably go somewhere in the common folder
@@ -94 +94 @@
    NETWORK_MSG clientMsg, serverMsg;
    map<unsigned int, Player> mapPlayers;
-   unsigned int unusedId = 0;
+   unsigned int unusedId = 1;
 
    //SSL_load_error_strings();
@@ -212 +212 @@
          {
             p->setAddr(from);
+            updateUnusedId(unusedId, mapPlayers);
             p->id = unusedId;
             mapPlayers[unusedId] = *p;
-            updateUnusedId(unusedId);
 
             strcpy(serverMsg.buffer, "Login successful. Enjoy chatting with other players.");
@@ -288 +288 @@
 }
 
-void updateUnusedId(unsigned int& id)
-{
-   id = 5;
-}
+void updateUnusedId(unsigned int& id, map<unsigned int, Player>& mapPlayers)
+{
+   while (mapPlayers.find(id) != mapPlayers.end())
+      id++;
+}