Changeset 5a5f131 in network-game

Timestamp:

Jun 19, 2013, 11:54:55 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

5c95436

Parents:

66c4ec4

Message:

Dead players aren't drawn

Files:

• client/Client/main.cpp (modified) (6 diffs)
• common/Projectile.cpp (modified) (2 diffs)

client/Client/main.cpp

@@ -367 +367 @@
             for (it2 = mapProjectiles.begin(); it2 != mapProjectiles.end(); it2++)
             {
-               cout << "Update projectile position" << endl;
                it2->second.move(mapPlayers);
             }
@@ -377 +376 @@
             for (it2 = mapProjectiles.begin(); it2 != mapProjectiles.end(); it2++)
             {
-               cout << "Draw projectile" << endl;
-
                Projectile proj = it2->second;
 
@@ -532 +529 @@
             case MSG_TYPE_PLAYER:   // kind of hacky to put this here
             {
-               cout << "Got MSG_TYPE_PLAYER message in STATE_START" << endl;
-
                Player p("", "");
                p.deserialize(msg.buffer);
                p.timeLastUpdated = getCurrentMillis();
+
                mapPlayers[p.id] = p;
 
-               cout << "new player id: " << p.id << endl;
-               cout << "map size: " << mapPlayers.size() << endl;
-
                break;
             }
             case MSG_TYPE_OBJECT:
             {
-               cout << "Received OBJECT message in STATE_START." << endl;
-
                WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
                o.deserialize(msg.buffer);
@@ -591 +582 @@
             case MSG_TYPE_PLAYER:
             {
-               //cout << "Got MSG_TYPE_PLAYER message in STATE_LOGIN" << endl;
-
                Player p("", "");
                p.deserialize(msg.buffer);
                p.timeLastUpdated = getCurrentMillis();
                p.isChasing = false;
+               if (p.health <= 0)
+                  p.isDead = true;
+               else
+                  p.isDead = false;
+
                mapPlayers[p.id] = p;
 
@@ -603 +597 @@
             case MSG_TYPE_PLAYER_MOVE:
             {
-               cout << "Got a player move message" << endl;
-
                unsigned int id;
                int x, y;
@@ -793 +785 @@
    {
       p = &it->second;
+
+      if (p->isDead)
+         continue;
+
       pos = mapToScreen(p->pos);
 

common/Projectile.cpp

@@ -74 +74 @@
    // if the current target logs off, this method will run into problems
 
-   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) {
@@ -92 +88 @@
    float dist = sqrt(pow(targetP.pos.x-pos.x, 2) + pow(targetP.pos.y-pos.y, 2));
 
-   cout << "About to finish projectile move" << endl;
-
    if (dist <= pixels) {
       pos.x = targetP.pos.x;