Changeset 60776f2 in network-game

Timestamp:

Dec 26, 2012, 3:27:08 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

5066e27

Parents:

3b8adee

git-author:

dportnoy <dmp1488@…> (12/26/12 15:26:07)

git-committer:

dportnoy <dmp1488@…> (12/26/12 15:27:08)

Message:

Changed the client to use serialize/deserialize and added serialization code for the player location

Files:

• client/Client/main.cpp (modified) (2 diffs)
• common/Player.cpp (modified) (2 diffs)

client/Client/main.cpp

@@ -371 +371 @@
 {
    string response = string(msg.buffer);
+
+   cout << "Got message: " << msg.type << endl;
 
    switch(state)
@@ -437 +439 @@
             case MSG_TYPE_PLAYER:
             {
-               Player p = *(Player*)(&(msg.buffer));
-
-               cout << "p.name: " << p.name;
-               cout << "p.pos.x: " << p.pos.x;
-               cout << "p.pos.y: " << p.pos.y;
+               Player p("", "");
+               p.deserialize(msg.buffer);
+
+               cout << "p.name: " << p.name << endl;
+               cout << "p.pos.x: " << p.pos.x << endl;
+               cout << "p.pos.y: " << p.pos.y << endl;
 
                break;

common/Player.cpp

@@ -37 +37 @@
 
    oss << this->name;
+   oss.write((char*)&(this->pos.x), sizeof(int));
+   oss.write((char*)&(this->pos.y), sizeof(int));
 
-   memcpy(buffer, oss.str().c_str(), this->name.length()+1);
+   memcpy(buffer, oss.str().c_str(), this->name.length()+1+2*sizeof(int));
 }
 
@@ -44 +46 @@
 {
    istringstream iss;
+   iss.str(buffer);
 
    iss >> this->name;
+   iss.read((char*)&(this->pos.x), sizeof(int));
+   iss.read((char*)&(this->pos.y), sizeof(int));
 }