Changeset 11d21ee in network-game for common

Timestamp:

Jun 9, 2013, 9:30:32 PM (11 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

Location:

common

Files:

• Player.cpp (modified) (8 diffs)
• Player.h (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