Changeset b92e6a7 in network-game for common

Timestamp:

Sep 26, 2013, 8:29:14 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

f41a7f9

Parents:

321fbbc

Message:

The Game class now has a WorldMap. When a client creates or joins a game, the server sends out all the basic game info (the map and info about all players in the game)

Location:

common

Files:

• Game.cpp (modified) (4 diffs)
• Game.h (modified) (3 diffs)
• WorldMap.cpp (modified) (1 diff)

common/Game.cpp

@@ -6 +6 @@
    this->id = 0;
    this->name = "";
+   this->blueScore = 0;
+   this->redScore = 0;
+   this->worldMap = NULL;
 }
 
@@ -11 +14 @@
    this->id = 0;
    this->name = name;
+   this->blueScore = 0;
+   this->redScore = 0;
+   this->worldMap = WorldMap::loadMapFromFile("../data/map.txt");
 }
 
 Game::~Game() {
-}
-
-void Game::setId(int id) {
-   this->id = id;
+   delete this->worldMap;
 }
 
 int Game::getNumPlayers() {
-   return players.size();
+   return this->players.size();
+}
+
+map<unsigned int, Player*>& Game::getPlayers() {
+   return this->players;
+}
+
+int Game::getRedScore() {
+   return this->redScore;
+}
+
+int Game::getBlueScore() {
+   return this->blueScore;
+}
+
+WorldMap* Game::getMap() {
+   return this->worldMap;
+}
+
+void Game::setId(unsigned int id) {
+   this->id = id;
 }
 
@@ -33 +56 @@
 }
 
-bool Game::removePlayer(int id) {
+bool Game::removePlayer(unsigned int id) {
    if (players.erase(id) == 1)
       return true;
@@ -39 +62 @@
       return false;
 }
+
+void Game::setRedScore(int score) {
+   this->redScore = score;
+}
+
+void Game::setBlueScore(int score) {
+   this->blueScore = score;
+}

common/Game.h

@@ -15 +15 @@
 
 #include "Player.h"
+#include "WorldMap.h"
 
 using namespace std;
@@ -20 +21 @@
 class Game {
 private:
-   int id;
+   unsigned int id;
    string name;
-   map<int, Player*> players;
+   map<unsigned int, Player*> players;
+   WorldMap* worldMap;
+   int blueScore;
+   int redScore;
 
 public:
@@ -31 +35 @@
 
    int getNumPlayers();
+   map<unsigned int, Player*>& getPlayers();
+   int getBlueScore();
+   int getRedScore();
+   WorldMap* getMap();
 
-   void setId(int id);
+   void setId(unsigned int id);
    bool addPlayer(Player* p);
-   bool removePlayer(int id);
+   bool removePlayer(unsigned int id);
+   void setBlueScore(int score);
+   void setRedScore(int score);
 };
 

common/WorldMap.cpp

@@ -194 +194 @@
 WorldMap* WorldMap::loadMapFromFile(string filename)
 {
-    WorldMap* m = NULL;
+   WorldMap* m = NULL;
 
    ifstream file(filename.c_str());