Changeset 1d96513 in network-game for common

Timestamp:

Dec 22, 2013, 2:57:04 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

45734ff

Parents:

483a2cb

Message:

Game class includes projectile list

Location:

common

Files:

• Game.cpp (modified) (3 diffs)
• Game.h (modified) (5 diffs)

common/Game.cpp

@@ -37 +37 @@
 }
 
+map<unsigned int, Projectile>& Game::getProjectiles() {
+   return this->projectiles;
+}
+
 int Game::getRedScore() {
    return this->redScore;
@@ -51 +55 @@
 void Game::setId(unsigned int id) {
    this->id = id;
+}
+
+void Game::setRedScore(int score) {
+   this->redScore = score;
+}
+
+void Game::setBlueScore(int score) {
+   this->blueScore = score;
 }
 
@@ -147 +159 @@
 }
 
-void Game::setRedScore(int score) {
-   this->redScore = score;
+bool Game::addProjectile(Projectile p) {
+   if (projectiles.find(p.id) == projectiles.end()) {
+      projectiles[p.id] = p;
+      return true;
+   }
+   else
+      return false;
 }
 
-void Game::setBlueScore(int score) {
-   this->blueScore = score;
+bool Game::removeProjectile(unsigned int id) {
+   if (projectiles.erase(id) == 1)
+      return true;
+   else
+      return false;
 }

common/Game.h

@@ -13 +13 @@
 #include "Player.h"
 #include "WorldMap.h"
+#include "Projectile.h"
 
 using namespace std;
@@ -21 +22 @@
    string name;
    map<unsigned int, Player*> players;
+   map<unsigned int, Projectile> projectiles;
    WorldMap* worldMap;
    int blueScore;
@@ -34 +36 @@
    int getNumPlayers();
    map<unsigned int, Player*>& getPlayers();
+   map<unsigned int, Projectile>& getProjectiles();
    int getBlueScore();
    int getRedScore();
@@ -39 +42 @@
 
    void setId(unsigned int id);
+   void setBlueScore(int score);
+   void setRedScore(int score);
+
    bool addPlayer(Player* p);
    bool removePlayer(unsigned int id);
@@ -45 +51 @@
    int processFlagPickupRequest(Player* p);
 
-   void setBlueScore(int score);
-   void setRedScore(int score);
+   bool addProjectile(Projectile p);
+   bool removeProjectile(unsigned int id);
 };