generic Observer is working?

src/include/Activities/FightActivity.hpp

@@ -9,21 +9,8 @@
 #include <SFML/Graphics.hpp>
 
 #include "Activities/Activity.hpp"
-#include "ActivityEnum.hpp"
-#include "Animations/TextFadingManager.hpp"
-#include "Animations/IncomingBanner.hpp"
-#include "UIElements/UIStats.hpp"
-#include "UIObjects/UIEnemyOverview.hpp"
-#include "UIObjects/UIPlayerOverview.hpp"
-#include "UIElements/UIColorPicker.hpp"
-#include "UIElements/UIButton.hpp"
-#include "UIElements/UIBox.hpp"
-#include "Actors/Player.hpp"
-#include "PerlinNoise.hpp"
 #include "Game.hpp"
 #include "Defines.hpp"
-#include "Actors/Enemy.hpp"
-#include "Color.hpp"
 #include "FightEnv.hpp"
 #include "FightStates/PlayersTurn.hpp"
 #include "FightStates/EnemiesTurn.hpp"

src/include/Actors/Actor.hpp

@@ -12,7 +12,8 @@ struct RGB {
     int blue = 0;
 };
 
-class Actor: public Subject {
+
+class Actor: public Subject<Actor> {
   public:
     std::string name;
     int health;

src/include/Actors/Enemy.hpp

@@ -10,8 +10,6 @@ class Enemy: public Actor {
     Enemy();
     Enemy(std::string name, int health, int attackStrength, RGB defense, std::string picPath, std::string colorPicPath, std::string colorPicBorderPath);
 
-    void notify(int newValue) const override;
-
     void init();
     std::string colorPicPath;
     std::string colorPicBorderPath;

src/include/Actors/Player.hpp

@@ -11,7 +11,7 @@ class Player: public Actor {
       Player();
       Player(std::string name, int health, int attackStrength, RGB defense, std::string picFilePath);
 
-      void notify(int newValue) const override;
+
 };
 
 #endif

src/include/ObserverPattern/Observer.hpp

@@ -5,38 +5,70 @@
 #include <iostream>
 #include <memory>
 
+template <typename T>
 class Subject;
 
+template <typename T>
 class Observer {
   public:
-    Observer(Subject& subject);
-    virtual ~Observer();
+    Observer(Subject<T>& _subject): subject(_subject) {
+        this->subject.attachObserver(*this);
+        std::cout << "Observer" << std::endl;
+    }
+
+    virtual ~Observer() {
+        if (this->valid) {
+            subject.detachObserver(*this);
+        }
+    }
 
     Observer(const Observer&) = delete; // rule of three
     Observer& operator=(const Observer&) = delete;
 
-    virtual void update(int newValue);
-    void invalidateSubject();
-    bool subjectIsValid() const;
+    virtual void update(T entity) {
+        std::cout << "Got a notification" << std::endl;
+    }
+
+    void invalidateSubject() {
+        this->valid = false;
+    }
 
   private:
     bool valid = true;
-    Subject& subject;
+    Subject<T>& subject;
 };
 
+template <typename T>
 class Subject {
   public:
-    ~Subject();
-    using RefObserver = std::reference_wrapper<Observer>;
-    void attachObserver(Observer& observer);
-    void detachObserver(Observer& observer);
+    virtual ~Subject() {
+        this->valid = false;
+        for (auto& obs : this->observers) {
+            obs.get().invalidateSubject();
+        }
+    };
+    using RefObserver = std::reference_wrapper<Observer<T>>;
+    void attachObserver(Observer<T>& observer) {
+        this->observers.push_front(observer);
+    }
+
+    void detachObserver(Observer<T> &observer) {
+        this->observers.remove_if([&observer] (const RefObserver& obs) {
+
+            return &obs.get() == &observer;
+        });
+    }
     bool valid = true;
 
   private:
     std::list<RefObserver> observers;
 
   protected:
-    virtual void notify(int newValue) const = 0;
+    void notify(T entity) const {
+        for (const auto& obs: observers) {
+            obs.get().update(entity);
+        }
+    }
 };
 
 #endif

src/include/UIElements/UIStats.hpp

@@ -9,18 +9,16 @@
 #include "Game.hpp"
 #include "ObserverPattern/Observer.hpp"
 
-class UIStats: public UIElement, Observer {
+class UIStats: public UIElement, Observer<Actor> {
   public:
     ~UIStats();
     UIStats(std::shared_ptr<Actor> actor);
-    //void init(Actor actor);
     void draw() override;
     sf::Vector2f getPosition() override;
     void setPosition(float x, float y) override;
     sf::FloatRect getSize() override;
 
-    void updateHealth(int value);
-    void update(int newValue) override;
+    void update(Actor newActor) override;
 
   private:
       UIBox actorStatsBox = UIBox(sf::Color(51, 25, 0, 150), "borders/border_stats.png");

src/include/UIObjects/UIEnemyOverview.hpp

@@ -19,7 +19,7 @@ class UIEnemyOverview {
     sf::Text pickedColorText;
 
     //void init(Enemy enemy);
-    void changeHealth(int value);
+    void changeHealth(int lostHealth);
     void updatePickedColorText(std::string newText, sf::Color pickedColor);
     void draw();
 

src/main/Actors/Actor.cpp

@@ -1,9 +1,3 @@
 #include "Actors/Actor.hpp"
 
-Actor::Actor() {}
-
-
-/*Observer::Observer(Actor& subject_): subject(subject_) {
-  this->subject.attachObserver(*this);
-}
-*/
+Actor::Actor() {}

src/main/Actors/Enemy.cpp

@@ -20,10 +20,6 @@ Enemy::Enemy(std::string _name, int _health, int _attackStrength, RGB _defense,
     this->colorPicBorderPath = _colorPicBorderPath;
 }
 
-void Enemy::notify(int newValue) const {
-    std::cout << "Got a notification" << std::endl;
-}
-
 
 void Enemy::init() {
 

src/main/Actors/Player.cpp

@@ -14,8 +14,4 @@ Player::Player(std::string _name, int _health, int _attackStrength, RGB _defense
     this->attackStrength = _attackStrength;
     this->defense = _defense;
     this->picPath = _picFilePath;
-}
-
-void Player::notify(int newValue) const {
-    std::cout << "Player changed!" << std::endl;
-}
+}

src/main/ObserverPattern/Observer.cpp

@@ -1,50 +1 @@
-#include "ObserverPattern/Observer.hpp"
-
-Observer::Observer(Subject& _subject): subject(_subject) {
-  subject.attachObserver(*this);
-  std::cout << "Observer" << std::endl;
-}
-
-Observer::~Observer() {
-  if (this->valid) {
-    subject.detachObserver(*this);
-  }
-}
-
-void Observer::update(int newValue) {
-  std::cout << "Got a notification" << std::endl;
-}
-
-
-void Observer::invalidateSubject() {
-  this->valid = false;
-}
-
-bool Observer::subjectIsValid() const {
-  return this->valid;
-}
-
-Subject::~Subject() {
-  this->valid = false;
-  for (auto& obs : observers) {
-    obs.get().invalidateSubject();
-  }
-}
-
-
-void Subject::notify(int newValue) const {
-  for (const auto& obs: observers) {
-    obs.get().update(newValue);
-  }
-}
-
-void Subject::attachObserver(Observer& observer) {
-  this->observers.push_front(observer);
-}
-
-void Subject::detachObserver(Observer &observer) {
-  this->observers.remove_if([&observer] (const RefObserver& obs) {
-
-    return &obs.get() == &observer;
-  });
-}
+#include "ObserverPattern/Observer.hpp"

src/main/UIElements/UIStats.cpp

@@ -3,7 +3,7 @@
 UIStats::~UIStats() {
 }
 
-UIStats::UIStats(std::shared_ptr<Actor> actor): Observer(*actor) {
+UIStats::UIStats(std::shared_ptr<Actor> actor): Observer(reinterpret_cast<Subject<Actor> &>(*actor)) {
   Game& game = Game::getInstance();
   sf::Vector2u windowSize = game.gameWindow.getSize();
   sf::Color statsValueFontColor = sf::Color::Yellow;
@@ -94,10 +94,6 @@ sf::FloatRect UIStats::getSize() {
   return this->actorStatsBox.getSize();
 }
 
-void UIStats::updateHealth(int value) {
-  this->actorHealthValue.setString(std::to_string(value));
-}
-
-void UIStats::update(int newValue) {
-  this->actorHealthValue.setString(std::to_string(newValue));
+void UIStats::update(Actor newActor) {
+  this->actorHealthValue.setString(std::to_string(newActor.health));
 }

src/main/UIObjects/UIEnemyOverview.cpp

@@ -54,10 +54,10 @@ void UIEnemyOverview::draw() {
   this->enemyBorderedImage.draw();
 }
 
-void UIEnemyOverview::changeHealth(int value) {
-  int newHealth = std::max(this->enemy.health - value, 0);
+void UIEnemyOverview::changeHealth(int lostHealth) {
+  int newHealth = std::max(this->enemy.health - lostHealth, 0);
   this->enemy.health = newHealth;
-  this->enemyStats.update(newHealth);
+  this->enemyStats.update(this->enemy);
 }
 
 void UIEnemyOverview::updatePickedColorText(std::string newText, sf::Color pickedColor) {

src/main/UIObjects/UIPlayerOverview.cpp

@@ -57,7 +57,7 @@ void UIPlayerOverview::init() {
 void UIPlayerOverview::changeHealth(int value) {
   int newHealth = std::max(this->player.health - value, 0);
   this->player.health = newHealth;
-  this->uiPlayerStats.update(newHealth);
+  this->uiPlayerStats.update(this->player);
 }
 
 void UIPlayerOverview::draw() {