Changeset 5b92307 in network-game for common/Game.cpp

Timestamp:

Jan 20, 2014, 6:47:58 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

204edcf

Parents:

949cf70

Message:

id and targetPlayer are now both private members of the Player class and have getters and setters to access them

File:

• common/Game.cpp (modified) (5 diffs)

common/Game.cpp

@@ -43 +43 @@
 
 bool Game::addPlayer(Player* p) {
-   if (players.find(p->id) == players.end()) {
-      players[p->id] = p;
+   if (players.find(p->getId()) == players.end()) {
+      players[p->getId()] = p;
       return true;
    }
@@ -429 +429 @@
          cout << "Melee attack" << endl;
 
-         Player* target = players[p->targetPlayer];
+         Player* target = players[p->getTargetPlayer()];
          this->dealDamageToPlayer(target, p->damage);
       }
@@ -436 +436 @@
          cout << "Ranged attack" << endl;
 
-         Projectile proj(p->pos.x, p->pos.y, p->targetPlayer, p->damage);
+         Projectile proj(p->pos.x, p->pos.y, p->getTargetPlayer(), p->damage);
          this->assignProjectileId(&proj);
          this->addProjectile(proj);
@@ -442 +442 @@
          int x = p->pos.x;
          int y = p->pos.y;
+         unsigned int targetId = p->getTargetPlayer();
 
          serverMsg.type = MSG_TYPE_PROJECTILE;
@@ -447 +448 @@
          memcpy(serverMsg.buffer+4, &x, 4);
          memcpy(serverMsg.buffer+8, &y, 4);
-         memcpy(serverMsg.buffer+12, &p->targetPlayer, 4);
+         memcpy(serverMsg.buffer+12, &targetId, 4);
          msgProcessor->broadcastMessage(serverMsg, players);
       }