Changeset ff2133a in network-game for common

Timestamp:

Jun 11, 2013, 1:24:09 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

5b1e31e

Parents:

11d21ee

Message:

Move player chasing behavior to the Player class so the same behavior can be run client-side

Location:

common

Files:

• Player.cpp (modified) (1 diff)
• Player.h (modified) (2 diffs)
• Projectile.cpp (modified) (2 diffs)

common/Player.cpp

@@ -191 +191 @@
    return moving;
 }
+
+void Player::updateTarget(map<unsigned int, Player>& mapPlayers) {
+   if (this->isChasing) {
+      this->target.x = mapPlayers[this->targetPlayer].pos.x;
+      this->target.y = mapPlayers[this->targetPlayer].pos.y;
+
+      if (posDistance(this->pos, this->target.toFloat()) <= this->range) {
+         this->target.x = this->pos.x;
+         this->target.y = this->pos.y;
+
+         this->isChasing = false;
+         this->isAttacking = true;
+         this->timeAttackStarted = getCurrentMillis();
+      }
+   }
+}

common/Player.h

@@ -12 +12 @@
 
 #include <string>
+#include <map>
 
 #include "Common.h"
@@ -46 +47 @@
    void deserialize(char* buffer);
 
+   void updateTarget(map<unsigned int, Player>& mapPlayers);
    bool move(WorldMap *map);
 
-   void takeFlag(int flag, WorldMap *map);
-   void dropFlag(int flag, WorldMap *map);
+   void takeFlag(int flag, WorldMap* map);
+   void dropFlag(int flag, WorldMap* map);
 
    int id;

common/Projectile.cpp

@@ -72 +72 @@
 
 bool Projectile::move(map<unsigned int, Player>& mapPlayers) {
+   // if the current target logs off, this method will run into problems
+
+   //cout << "Inside projectile move" << endl;
+
    unsigned long long curTime = getCurrentMillis();
    Player targetP = mapPlayers[target];
@@ -85 +89 @@
    float dist = sqrt(pow(targetP.pos.x-pos.x, 2) + pow(targetP.pos.y-pos.y, 2));
 
+   //cout << "About to finish projectile move" << endl;
+
    if (dist <= pixels) {
       pos.x = targetP.pos.x;