Changeset 5b1e31e in network-game for common

Timestamp:

Jun 16, 2013, 11:12:31 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

032e550, d3e8f60

Parents:

ff2133a

Message:

Fix some bugs related to player attack and movement

Location:

common

Files:

• Player.cpp (modified) (4 diffs)
• Player.h (modified) (1 diff)

common/Player.cpp

@@ -142 +142 @@
    memcpy(buffer+44, &this->hasBlueFlag, 1);
    memcpy(buffer+45, &this->hasRedFlag, 1);
+   memcpy(buffer+46, &this->range, 4);
 
    strcpy(buffer+46, this->name.c_str());
@@ -162 +163 @@
    memcpy(&this->hasBlueFlag, buffer+44, 1);
    memcpy(&this->hasRedFlag, buffer+45, 1);
+   memcpy(&this->range, buffer+46, 4);
 
    this->name.assign(buffer+46);
@@ -192 +194 @@
 }
 
-void Player::updateTarget(map<unsigned int, Player>& mapPlayers) {
+bool Player::updateTarget(map<unsigned int, Player>& mapPlayers) {
    if (this->isChasing) {
       this->target.x = mapPlayers[this->targetPlayer].pos.x;
@@ -204 +206 @@
          this->isAttacking = true;
          this->timeAttackStarted = getCurrentMillis();
+
+         return true;
       }
    }
-}
+
+   return false;
+}

common/Player.h

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