Merge pull request #47 from tresinformal/issue_23

Fix #23

Looks good.

game.cpp

@@ -18,6 +18,25 @@ ball game::get_ball() const
   return b;
 }
 
+bool has_winner(const game& g) {
+    return
+        g.get_players()[0].get_score() >= 20
+     || g.get_players()[1].get_score() >= 20
+    ;
+}
+int get_player_score(const game& g, const int player_index) {
+    return g.get_players().at(player_index).get_score();
+}
+
+
+void set_player_score(
+    game& g,
+    const int player_index,
+    const int score
+) {
+  g.get_players().at(player_index).set_score(score);
+}
+
 void test_game()
 {
   // Here write tests for the game logic
@@ -65,4 +84,16 @@ void test_game()
     assert(is_more_or_less_equal(ball_center_y, 0.0));
   }
   #endif // FIX_ISSUE_25
+  // #23: The game finishes when a player reaches 20 points
+  {
+    game g;
+    const int player_index{0};
+    const int score{20};
+    // Equivalent to g.get_player(player_index).set_score(score);
+    set_player_score(g, player_index, score);
+    get_player_score(g, player_index);
+    assert(get_player_score(g, player_index) == score); // Check ourselves
+    assert(has_winner(g));
+
+  }
 }

game.h

@@ -13,10 +13,23 @@ class game {
     int get_n_players();
     ball get_ball() const;
 
+    /// Read-only version of get_players
+    const auto& get_players() const noexcept { return players; }
+
+    /// Modifyable-players version of get_players
+    auto& get_players() noexcept { return players; }
+
 private:
     std::vector<player> players;
 };
 
+
+bool has_winner(const game& g);
+
+int get_player_score(const game& g, const int player_index);
+
+void set_player_score(game& g, const int player_index, const int score);
+
 void test_game();
 
 #endif // GAME_H

player.cpp

@@ -4,18 +4,31 @@ player::player(): m_score{0} {
 
 }
 
-int player::get_score() const {
+int player::get_score() const noexcept {
     return m_score;
 }
 
-void test_player() {
-    // Here write tests for players
-    // 17 - The player has a score counting system
-    const player player_g;
-    const int expected_player_score = 0;
-    const int player_score = player_g.get_score();
-    //check player score
-    assert(expected_player_score == player_score);
-
+void player::set_score(const int new_score) {
+    assert(new_score >= 0);
+    m_score = new_score;
+}
 
+void test_player()
+{
+    {
+        // Here write tests for players
+        // 17 - The player has a score counting system
+        const player player_g;
+        const int expected_player_score = 0;
+        const int player_score = player_g.get_score();
+        //check player score
+        assert(expected_player_score == player_score);
+    }
+    // can set and get the score
+    {
+        player p;
+        const int some_score{3}; // just a value, can be any between zero and 19 (inclusive)
+        p.set_score(some_score);
+        assert(p.get_score() == some_score);
+    }
 }

player.h

@@ -5,7 +5,8 @@
 class player {
 public:
     player();
-    int get_score() const;
+    int get_score() const noexcept;
+    void set_score(const int new_score);
 private:
     int m_score;
 };