Changeset 66c4ec4 in network-game for server/server.cpp

Timestamp:

Jun 19, 2013, 11:46:30 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

5a5f131

Parents:

c76134b

Message:

Restore the player's health and move him next to his base when he respawns

File:

• server/server.cpp (modified) (5 diffs)

server/server.cpp

@@ -176 +176 @@
 
                   it->second.pos = spawnPos.toFloat();
+                  it->second.target = spawnPos;
+                  it->second.health = it->second.maxHealth;
 
                   serverMsg.type = MSG_TYPE_PLAYER;
@@ -209 +211 @@
          bool broadcastMove = false;
          for (it = mapPlayers.begin(); it != mapPlayers.end(); it++) {
-            cout << "Starting new for loop iteration" << endl;
             oldPos = it->second.pos;
             if (it->second.move(gameMap)) {
@@ -440 +441 @@
          }
 
-         cout << "Done with the for loop" << endl;
-
          // move all projectiles
-         cout << "Moving projectiles" << endl;
          map<unsigned int, Projectile>::iterator itProj;
          for (itProj = mapProjectiles.begin(); itProj != mapProjectiles.end(); itProj++) {
@@ -481 +479 @@
          }
       }
-      cout << "Done moving projectiles" << endl;
 
       n = receiveMessage(&clientMsg, sock, &from);
@@ -904 +901 @@
       p->health = 0;
    if (p->health == 0) {
+      cout << "Player died" << endl;
       p->isDead = true;
       p->timeDied = getCurrentMillis();