Changeset b92e6a7 in network-game for common/Game.cpp

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)

File:

• common/Game.cpp (modified) (4 diffs)

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;
+}