Merge pull request coders-school#85 from lukasz-kukulka/fix_delegate

Fixed patern delegate add two function in ship and player class

Author: lukasz-kukulka

shm/inc/Delegate.hpp

@@ -5,5 +5,5 @@
 class Delegate {
 public: 
     virtual void payCrew(const size_t payCrew) = 0;
-    virtual ~Delegate(); 
+    virtual ~Delegate() {}; 
 };

shm/inc/Game.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <stddef.h>
+#include "shm/inc/Ship.hpp"
+#include "shm/inc/Player.hpp"
 
 class Game {
 public:

shm/inc/Player.hpp

@@ -11,6 +11,7 @@ class Cargo;
 class Player : public Delegate {
 public:
     Player(std::unique_ptr<Ship> ship, size_t money, size_t availableSpace);
+    ~Player() override {};
 
     std::unique_ptr<Ship> getShip() { return std::move(ship_); };
     size_t getMoney() const { return money_; };
@@ -20,6 +21,7 @@ class Player : public Delegate {
 
     //override from Delegate
     void payCrew(const size_t payCrew) override;
+    void setPlayerPtr();
 
 private:
     std::unique_ptr<Ship> ship_;

shm/inc/Ship.hpp

@@ -8,11 +8,12 @@
 
 class Cargo;
 class Delegate;
+class Player;
 
 class Ship : public Subscriber {
 public:
     Ship() = default;
-    Ship(int id, const std::string& name, size_t speed, size_t maxCrew, size_t capacity, Delegate* delegate);
+    Ship(int id, const std::string& name, size_t speed, size_t maxCrew, size_t capacity, Delegate* delegate = nullptr);
     Ship(int id, size_t speed, size_t maxCrew, Delegate* delegate);
 
     Ship& operator+=(const size_t amount);
@@ -29,6 +30,7 @@ class Ship : public Subscriber {
     void setName(const std::string& name);
     void load(const std::shared_ptr<Cargo>);
     void unload(Cargo* cargo);
+    void changeDelegate(Player* player);
 
     // overload form Subscriber
     void nextDay() override;

shm/src/Game.cpp

@@ -1,4 +1,6 @@
 #include "shm/inc/Game.hpp"
+#include <iostream>
+#include <memory>
 
 Game::Game(size_t money, size_t game_days, size_t final_goal)
     : money_(money)

shm/src/Player.cpp

@@ -33,3 +33,7 @@ void Player::payCrew(const size_t payCrew) {
         ? money_ = 0 
         : money_ -= payCrew;
 }
+
+void Player::setPlayerPtr() {
+    ship_->changeDelegate(this);
+}

shm/src/Ship.cpp

@@ -6,6 +6,7 @@
 
 #include "shm/inc/Cargo.hpp"
 #include "shm/inc/Delegate.hpp"
+#include "shm/inc/Player.hpp"
 
 Ship::Ship(int id, const std::string& name, size_t speed, size_t maxCrew, size_t capacity, Delegate* delegate)
     : id_(id)
@@ -88,3 +89,7 @@ void Ship::unload(Cargo* cargo) {
 void Ship::nextDay() {
     delegate_->payCrew(crew_);
 }
+
+void Ship::changeDelegate(Player* player) {
+    delegate_ = player;
+}

shm/src/Store.cpp

@@ -41,3 +41,4 @@ void Store::nextDay() {
         cargo->setAmount(distribution(generator));
     }
 }
+