Changeset 01d0d00 in network-game for common

Timestamp:

Dec 27, 2012, 7:04:49 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

0333211, 3a79253

Parents:

5066e27

Message:

The server now uses a map to store players with player ids as keys

Location:

common

Files:

• Player.cpp (modified) (4 diffs)
• Player.h (modified) (2 diffs)

common/Player.cpp

@@ -7 +7 @@
 using namespace std;
 
+Player::Player()
+{
+   this->id = 0;
+   this->name = "";
+   this->password = "";
+   this->pos.x = 0;
+   this->pos.y = 0;
+}
+
+Player::Player(const Player& p)
+{
+   this->id = p.id;
+   this->name = p.name;
+   this->password = p.password;
+   this->pos.x = p.pos.x;
+   this->pos.y = p.pos.y;
+   this->addr = p.addr;
+}
+
 Player::Player(string name, string password)
 {
+   this->id = 0;
    this->name = name;
    this->password = password;
    this->pos.x = 200;
    this->pos.y = 200;
-
-   cout << "Created new player: " << this->name << endl;
 }
 
 Player::Player(string name, sockaddr_in addr)
 {
+   this->id = 0;
    this->name = name;
    this->password = "";
@@ -24 +43 @@
    this->pos.y = 200;
    this->addr = addr;
-
-   cout << "Created new played: " << this->name << endl;
 }
 
@@ -36 +53 @@
    ostringstream oss;
 
+   oss.write((char*)&(this->id), sizeof(int));
    oss << this->name;
    oss.write("\0", 1);
@@ -49 +67 @@
    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));
+}
+
+void Player::setId(int id)
+{
+   this->id = id;
 }
 

common/Player.h

@@ -19 +19 @@
 class Player {
 public:
+   Player();
+   Player(const Player& p);
    Player(string name, string password);
    Player(string name, sockaddr_in addr); // this will be deleted
+
    ~Player();
 
@@ -26 +29 @@
    void deserialize(char* buffer);
 
+   void setId(int id);
    void setAddr(sockaddr_in addr);
 
+   int id;
    string name;
    string password;