Changeset e6c26b8 in network-game for common/Projectile.cpp

Timestamp:

Oct 1, 2013, 8:08:24 PM (11 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

95ffe57

Parents:

373089e

Message:

The client dynamically allocates memory for players and passes around a map with player pointers and some includes are now in individual files instead of in Common.h

File:

• common/Projectile.cpp (modified) (2 diffs)

common/Projectile.cpp

@@ -71 +71 @@
 }
 
-bool Projectile::move(map<unsigned int, Player>& mapPlayers) {
+bool Projectile::move(map<unsigned int, Player*>& mapPlayers) {
    // if the current target logs off, this method will run into problems
 
    unsigned long long curTime = getCurrentMillis();
 
-   Player targetP = mapPlayers[target];
+   Player* targetP = mapPlayers[target];
 
    if (timeLastUpdated == 0) {
@@ -85 +85 @@
 
    float pixels = speed * (curTime-timeLastUpdated) / 1000.0;
-   double angle = atan2(targetP.pos.y-pos.y, targetP.pos.x-pos.x);
-   float dist = sqrt(pow(targetP.pos.x-pos.x, 2) + pow(targetP.pos.y-pos.y, 2));
+   double angle = atan2(targetP->pos.y-pos.y, targetP->pos.x-pos.x);
+   float dist = sqrt(pow(targetP->pos.x-pos.x, 2) + pow(targetP->pos.y-pos.y, 2));
 
    if (dist <= pixels) {
-      pos.x = targetP.pos.x;
-      pos.y = targetP.pos.y;
+      pos.x = targetP->pos.x;
+      pos.y = targetP->pos.y;
       return true;
    }else {