Changeset 11d21ee in network-game for server/server.cpp

Timestamp:

Jun 9, 2013, 9:30:32 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

ff2133a

Parents:

8c74150

Message:

When a player tries to attack someone, they will now move toward the target until they are in range and then start the actual attack

File:

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

server/server.cpp

@@ -145 +145 @@
          timeLastUpdated = curTime;
 
+         map<unsigned int, Player>::iterator it;
+
+         // set targets for all chasing players (or make them attack if they're close enough)
+         for (it = mapPlayers.begin(); it != mapPlayers.end(); it++) {
+            Player* p = &it->second;
+
+            if (p->isChasing) {
+               p->target.x = mapPlayers[p->targetPlayer].pos.x;
+               p->target.y = mapPlayers[p->targetPlayer].pos.y;
+
+               if (posDistance(p->pos, p->target.toFloat()) <= p->range) {
+                  p->target.x = p->pos.x;
+                  p->target.y = p->pos.y;
+
+                  p->isChasing = false;
+                  p->isAttacking = true;
+                  p->timeAttackStarted = getCurrentMillis();
+               }
+            }
+         }
+
          // move all players
          // maybe put this in a separate method
-         map<unsigned int, Player>::iterator it;
          FLOAT_POSITION oldPos;
          bool broadcastMove = false;
@@ -778 +798 @@
 
          Player* source = &mapPlayers[id];
-         source->timeAttackStarted = getCurrentMillis();
          source->targetPlayer = targetId;
-         source->isAttacking = true;
-
+         source->isChasing = true;
+
+         // this is irrelevant since the client doesn't even listen for START_ATTACK messages
+         // actually, the client should not ignore this and should instead perform the same movement
+         // algorithm on its end (following the target player until in range) that the server does.
+         // Once the attacker is in range, the client should stop movement and wait for messages
+         // from the server
          serverMsg.type = MSG_TYPE_START_ATTACK;
          memcpy(serverMsg.buffer, &id, 4);