moved observer destructor calles to the end

Ipagaxi · May 26, 2024 · 2d093cd · 2d093cd
1 parent 515b1e8
commit 2d093cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/include/Activities/FightActivity.hpp b/src/include/Activities/FightActivity.hpp
@@ -42,6 +42,7 @@ class FightActivity: public Activity {
   private:
     FightEnv fightEnv;
     FightStateEnum currentFightStateEnum = FightStateEnum::TURN_CHANGE;
+    std::shared_ptr<Enemy> enemy;
 
     std::unique_ptr<FightState> currentFightState;
 

diff --git a/src/main/Activities/FightActivity.cpp b/src/main/Activities/FightActivity.cpp
@@ -3,8 +3,8 @@
 
 FightActivity::FightActivity() : Activity(), fightEnv(), currentFightState(std::make_unique<TurnChangeState>(fightEnv)) {
   Game& game = Game::getInstance();
-  Enemy enemy = this->initEnemy();
-  this->fightEnv.enemyOverview = std::make_unique<UIEnemyOverview>(enemy);
+  this->enemy = std::make_shared<Enemy>(this->initEnemy());
+  this->fightEnv.enemyOverview = std::make_unique<UIEnemyOverview>(*this->enemy);
   this->fightEnv.playerOverview.init();
 
   this->fightEnv.backgroundTX.loadFromFile(RESOURCE_PATH "backgrounds/background_fight.png");

diff --git a/src/main/ObserverPattern/Observer.cpp b/src/main/ObserverPattern/Observer.cpp
@@ -8,7 +8,7 @@ Observer::Observer() {
 
 Observer::~Observer() {
   std::cout << "~Observer" << std::endl;
-  //this->subject->detachObserver(*this);
+  this->subject->detachObserver(*this);
 }
 
 void Observer::onNotify(int newValue) {}