Changeset 5b1e31e in network-game for server

Timestamp:

Jun 16, 2013, 11:12:31 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

032e550, d3e8f60

Parents:

ff2133a

Message:

Fix some bugs related to player attack and movement

File:

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

server/server.cpp

@@ -119 +119 @@
 
    sock = socket(AF_INET, SOCK_DGRAM, 0);
-   if (sock < 0) error("Opening socket");
+   if (sock < 0)
+      error("Opening socket");
    length = sizeof(server);
    bzero(&server,length);
@@ -149 +150 @@
          // 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;
-            it->second.updateTarget(mapPlayers);
-
-            /*
-            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();
-               }
-            }
-            */
+            if (it->second.updateTarget(mapPlayers)) {
+               serverMsg.type = MSG_TYPE_PLAYER;
+               it->second.serialize(serverMsg.buffer);
+
+               map<unsigned int, Player>::iterator it2;
+               for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++)
+               {
+                  if ( sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 )
+                     error("sendMessage");
+               }
+            }
          }
 
@@ -187 +181 @@
                      it->second.target.x = it->second.pos.x;
                      it->second.target.y = it->second.pos.y;
+                     it->second.isChasing = false;
                      broadcastMove = true;
                      break;
@@ -689 +684 @@
                mapPlayers[id].target.y = y;
 
+               mapPlayers[id].isChasing = false;
+               mapPlayers[id].isAttacking = false;
+
                serverMsg.type = MSG_TYPE_PLAYER_MOVE;