Changeset 11d21ee in network-game

Timestamp:

Jun 9, 2013, 9:30:32 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

ff2133a

Parents:

8c74150

Message:

When a player tries to attack someone, they will now move toward the target until they are in range and then start the actual attack

Files:

• common/Player.cpp (modified) (8 diffs)
• common/Player.h (modified) (2 diffs)
• server/server.cpp (modified) (2 diffs)

common/Player.cpp

@@ -17 +17 @@
    this->timeLastUpdated = 0;
    this->timeAttackStarted = 0;
+   this->isChasing = false;
    this->isAttacking = false;
 
@@ -24 +25 @@
    this->attackType = ATTACK_NONE;
    this->damage = 0;
+   this->range = 0;
    this->attackCooldown = 0;
    this->team = 0;   // blue team by default
@@ -42 +44 @@
    this->timeLastUpdated = p.timeLastUpdated;
    this->timeAttackStarted = p.timeAttackStarted;
+   this->isChasing = p.isChasing;
    this->isAttacking = p.isAttacking;
 
@@ -49 +52 @@
    this->attackType = p.attackType;
    this->damage = p.damage;
+   this->range = p.range;
    this->attackCooldown = p.attackCooldown;
    this->team = p.team;
@@ -65 +69 @@
    this->timeLastUpdated = 0;
    this->timeAttackStarted = 0;
+   this->isChasing = false;
    this->isAttacking = false;
 
@@ -72 +77 @@
    this->attackType = ATTACK_NONE;
    this->damage = 0;
+   this->range = 0;
    this->attackCooldown = 0;
    this->team = 0;   // blue team by default
@@ -100 +106 @@
          this->attackType = ATTACK_MELEE;
          this->damage = 10;
+         this->range = 30;
          this->attackCooldown = 800;
          break;
@@ -107 +114 @@
          this->attackType = ATTACK_RANGED;
          this->damage = 6;
+         this->range = 100;
          this->attackCooldown = 1000;
          break;

common/Player.h

@@ -59 +59 @@
    unsigned long long timeLastUpdated;
    unsigned long long timeAttackStarted;
+   bool isChasing;
    bool isAttacking;
    int targetPlayer;
@@ -67 +68 @@
    int attackType;
    int damage;
+   int range;
    unsigned long long attackCooldown;
    int team; // 0 is blue, 1 is red

server/server.cpp

@@ -145 +145 @@
          timeLastUpdated = curTime;
 
+         map<unsigned int, Player>::iterator it;
+
+         // set targets for all chasing players (or make them attack if they're close enough)
+         for (it = mapPlayers.begin(); it != mapPlayers.end(); it++) {
+            Player* p = &it->second;
+
+            if (p->isChasing) {
+               p->target.x = mapPlayers[p->targetPlayer].pos.x;
+               p->target.y = mapPlayers[p->targetPlayer].pos.y;
+
+               if (posDistance(p->pos, p->target.toFloat()) <= p->range) {
+                  p->target.x = p->pos.x;
+                  p->target.y = p->pos.y;
+
+                  p->isChasing = false;
+                  p->isAttacking = true;
+                  p->timeAttackStarted = getCurrentMillis();
+               }
+            }
+         }
+
          // move all players
          // maybe put this in a separate method
-         map<unsigned int, Player>::iterator it;
          FLOAT_POSITION oldPos;
          bool broadcastMove = false;
@@ -778 +798 @@
 
          Player* source = &mapPlayers[id];
-         source->timeAttackStarted = getCurrentMillis();
          source->targetPlayer = targetId;
-         source->isAttacking = true;
-
+         source->isChasing = true;
+
+         // this is irrelevant since the client doesn't even listen for START_ATTACK messages
+         // actually, the client should not ignore this and should instead perform the same movement
+         // algorithm on its end (following the target player until in range) that the server does.
+         // Once the attacker is in range, the client should stop movement and wait for messages
+         // from the server
          serverMsg.type = MSG_TYPE_START_ATTACK;
          memcpy(serverMsg.buffer, &id, 4);