Changeset 45734ff in network-game for server

Timestamp:

Dec 22, 2013, 10:14:43 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

58ca135

Parents:

1d96513

Message:

The Game class stores a list of projectiles present in that game

File:

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

server/server.cpp

@@ -48 +48 @@
 
 void updateUnusedPlayerId(unsigned int& id, map<unsigned int, Player*>& mapPlayers);
-void updateUnusedProjectileId(unsigned int& id, map<unsigned int, Projectile>& mapProjectiles);
 Player *findPlayerByName(map<unsigned int, Player*> &m, string name);
 Player *findPlayerByAddr(map<unsigned int, Player*> &m, const sockaddr_in &addr);
@@ -476 +475 @@
 
                   Projectile proj(p->pos.x, p->pos.y, p->targetPlayer, p->damage);
-                  proj.id = unusedProjectileId;
-                  updateUnusedProjectileId(unusedProjectileId, mapProjectiles);
-                  mapProjectiles[proj.id] = proj;
-
-                  int x = it->second->pos.x;
-                  int y = it->second->pos.y;
+                  p->currentGame->assignProjectileId(&proj);
+                  
+                  p->currentGame->addProjectile(proj);
+
+                  int x = p->pos.x;
+                  int y = p->pos.y;
 
                   serverMsg.type = MSG_TYPE_PROJECTILE;
@@ -487 +486 @@
                   memcpy(serverMsg.buffer+4, &x, 4);
                   memcpy(serverMsg.buffer+8, &y, 4);
-                  memcpy(serverMsg.buffer+12, &it->second->targetPlayer, 4);
+                  memcpy(serverMsg.buffer+12, &p->targetPlayer, 4);
                }
                else
@@ -507 +506 @@
          // move all projectiles
          // see if this can be moved inside the game class
+         // this method can be moved when I add a MessageProcessor to the Game class
          map<unsigned int, Projectile>::iterator itProj;
          for (itProj = mapProjectiles.begin(); itProj != mapProjectiles.end(); itProj++)
@@ -1198 +1198 @@
 }
 
-void updateUnusedProjectileId(unsigned int& id, map<unsigned int, Projectile>& mapProjectiles)
-{
-   while (mapProjectiles.find(id) != mapProjectiles.end())
-      id++;
-}
-
 Player *findPlayerByName(map<unsigned int, Player*> &m, string name)
 {