Changeset c76134b in network-game for common

Timestamp:

Jun 18, 2013, 11:16:21 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

66c4ec4

Parents:

1d0ede1

Message:

A player respawns at their flag 10 seconds after dying

Location:

common

Files:

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

common/Player.cpp

@@ -17 +17 @@
    this->timeLastUpdated = 0;
    this->timeAttackStarted = 0;
+   this->timeDied = 0;
    this->isChasing = false;
    this->isAttacking = false;
+   this->isDead = false;
 
    this->playerClass = CLASS_NONE;
@@ -44 +46 @@
    this->timeLastUpdated = p.timeLastUpdated;
    this->timeAttackStarted = p.timeAttackStarted;
+   this->timeDied = p.timeDied;
    this->isChasing = p.isChasing;
    this->isAttacking = p.isAttacking;
+   this->isDead = p.isDead;
 
    this->playerClass = p.playerClass;
@@ -69 +73 @@
    this->timeLastUpdated = 0;
    this->timeAttackStarted = 0;
+   this->timeDied = 0;
    this->isChasing = false;
    this->isAttacking = false;
+   this->isDead = false;
 
    this->playerClass = CLASS_NONE;

common/Player.h

@@ -61 +61 @@
    unsigned long long timeLastUpdated;
    unsigned long long timeAttackStarted;
+   unsigned long long timeDied;
    bool isChasing;
    bool isAttacking;
    int targetPlayer;
+   bool isDead;
 
    int playerClass;

common/Projectile.cpp

@@ -74 +74 @@
    // if the current target logs off, this method will run into problems
 
-   //cout << "Inside projectile move" << endl;
+   cout << "Inside projectile move" << endl;
 
    unsigned long long curTime = getCurrentMillis();
+   cout << "Got current time" << endl;
+
    Player targetP = mapPlayers[target];
+   cout << "Got target" << endl;
 
    if (timeLastUpdated == 0) {
@@ -89 +92 @@
    float dist = sqrt(pow(targetP.pos.x-pos.x, 2) + pow(targetP.pos.y-pos.y, 2));
 
-   //cout << "About to finish projectile move" << endl;
+   cout << "About to finish projectile move" << endl;
 
    if (dist <= pixels) {