Changeset d998572 in network-game

Timestamp:

Jan 19, 2014, 8:19:18 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

9ba9b96

Parents:

1f6233e

Message:

updateTarget (from the Player class) now takes the target as a parameter instead of the whole player map

Files:

• common/Player.cpp (modified) (1 diff)
• common/Player.h (modified) (1 diff)
• server/server.cpp (modified) (1 diff)

common/Player.cpp

@@ -217 +217 @@
 }
 
-bool Player::updateTarget(map<unsigned int, Player*>& mapPlayers) {
+bool Player::updateTarget(const Player* targetPlayer) {
    if (this->isChasing) {
-      this->target.x = mapPlayers[this->targetPlayer]->pos.x;
-      this->target.y = mapPlayers[this->targetPlayer]->pos.y;
+      this->target.x = targetPlayer->pos.x;
+      this->target.y = targetPlayer->pos.y;
 
       if (posDistance(this->pos, this->target.toFloat()) <= this->range) {

common/Player.h

@@ -48 +48 @@
    void deserialize(char* buffer);
 
-   bool updateTarget(map<unsigned int, Player*>& mapPlayers);
+   bool updateTarget(const Player* targetPlayer);
    bool move(WorldMap *map);
    void takeDamage(int damage);

server/server.cpp

@@ -171 +171 @@
             if (p->currentGame != NULL) {
                map<unsigned int, Player*> playersInGame = p->currentGame->getPlayers();
-               if (p->updateTarget(playersInGame))
+               if (p->updateTarget(playersInGame[p->targetPlayer]))
                {
                   serverMsg.type = MSG_TYPE_PLAYER;