Changes in / [d3e8f60:02fa8fd] in network-game

Files:

• client/Client/main.cpp (modified) (4 diffs)
• common/Player.cpp (modified) (2 diffs)

client/Client/main.cpp

@@ -351 +351 @@
             al_draw_text(font, al_map_rgb(0, 255, 0), 515, 80, ALLEGRO_ALIGN_LEFT, ossScoreRed.str().c_str());
 
-            // update player positions
+            // update players
             map<unsigned int, Player>::iterator it;
+            for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+            {
+               it->second.updateTarget(mapPlayers);
+            }
+
             for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
             {
@@ -483 +488 @@
 {
    string response = string(msg.buffer);
-
-   cout << "Processing message" << endl;
 
    switch(state)
@@ -588 +591 @@
             case MSG_TYPE_PLAYER:
             {
-               cout << "Got MSG_TYPE_PLAYER message in STATE_LOGIN" << endl;
+               //cout << "Got MSG_TYPE_PLAYER message in STATE_LOGIN" << endl;
 
                Player p("", "");
                p.deserialize(msg.buffer);
                p.timeLastUpdated = getCurrentMillis();
+               p.isChasing = false;
                mapPlayers[p.id] = p;
 
@@ -652 +656 @@
             case MSG_TYPE_ATTACK:
             {
+               cout << "Received ATTACK message" << endl;
+
+               break;
+            }
+            case MSG_TYPE_START_ATTACK:
+            {
+               cout << "Received START_ATTACK message" << endl;
+
+               unsigned int id, targetID;
+               memcpy(&id, msg.buffer, 4);
+               memcpy(&targetID, msg.buffer+4, 4);
+
+               cout << "source id: " << id << endl;
+               cout << "target id: " << targetID << endl;
+
+               Player* source = &mapPlayers[id];
+               source->targetPlayer = targetID;
+               source->isChasing = true;
+
                break;
             }

common/Player.cpp

@@ -199 +199 @@
       this->target.y = mapPlayers[this->targetPlayer].pos.y;
 
+      cout << "Setting target" << endl;
+      cout << "target id: " << mapPlayers[this->targetPlayer].id << endl;
+      cout << "cur player id: " << this->id << endl;
       cout << "this->pos.x: " << this->pos.x << endl;
       cout << "this->pos.x: " << this->pos.x << endl;
@@ -208 +211 @@
 
       if (posDistance(this->pos, this->target.toFloat()) <= this->range) {
+         cout << "Stopped chasing" << endl;
+
          this->target.x = this->pos.x;
          this->target.y = this->pos.y;