Changeset 6054f1e in network-game

Timestamp:

Jan 7, 2014, 1:07:36 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

d05c484

Parents:

eb2ad4f

Message:

Moved damagePlayer to the Player class

Files:

• common/Player.cpp (modified) (1 diff)
• common/Player.h (modified) (1 diff)
• server/server.cpp (modified) (4 diffs)

common/Player.cpp

@@ -206 +206 @@
 }
 
+void Player::takeDamage(int damage) {
+   this->health -= damage;
+   if (this->health < 0)
+      this->health = 0;
+   if (this->health == 0) {
+      cout << "Player died" << endl;
+      this->isDead = true;
+      this->timeDied = getCurrentMillis();
+   }
+}
+
 bool Player::updateTarget(map<unsigned int, Player*>& mapPlayers) {
    if (this->isChasing) {

common/Player.h

@@ -50 +50 @@
    bool updateTarget(map<unsigned int, Player*>& mapPlayers);
    bool move(WorldMap *map);
+   void takeDamage(int damage);
 
    void takeFlag(int flag, WorldMap* map);

server/server.cpp

@@ -53 +53 @@
 Player *findPlayerByName(map<unsigned int, Player*> &m, string name);
 Player *findPlayerByAddr(map<unsigned int, Player*> &m, const sockaddr_in &addr);
-void damagePlayer(Player *p, int damage);
 
 void addObjectToMap(WorldMap::ObjectType objectType, int x, int y, WorldMap* gameMap, map<unsigned int, Player*>& mapPlayers, MessageProcessor &msgProcessor);
@@ -222 +221 @@
 
                   Player* target = game->getPlayers()[itProj->second.target];
-                  damagePlayer(target, itProj->second.damage);
+                  target->takeDamage(itProj->second.damage);
 
                   if (target->isDead)
@@ -1029 +1028 @@
 
          Player* target = playersInGame[p->targetPlayer];
-         damagePlayer(target, p->damage);
+         target->takeDamage(p->damage);
 
          if (target->isDead)
@@ -1113 +1112 @@
 }
 
-void damagePlayer(Player *p, int damage) {
-   p->health -= damage;
-   if (p->health < 0)
-      p->health = 0;
-   if (p->health == 0) {
-      cout << "Player died" << endl;
-      p->isDead = true;
-      p->timeDied = getCurrentMillis();
-   }
-}
-
 void addObjectToMap(WorldMap::ObjectType objectType, int x, int y, WorldMap* gameMap, map<unsigned int, Player*>& mapPlayers, MessageProcessor &msgProcessor) {
    NETWORK_MSG serverMsg;