diff --git a/src/world/Encounter/EncounterFight.h b/src/world/Encounter/EncounterFight.h index 95ee8815..5e54b112 100644 --- a/src/world/Encounter/EncounterFight.h +++ b/src/world/Encounter/EncounterFight.h @@ -67,6 +67,6 @@ namespace Sapphire std::set< Entity::PlayerPtr > m_playerList; std::unordered_map< uint32_t, Entity::BNpcPtr > m_bnpcs; InstanceContentPtr m_pInstance; - EncounterFightStatus m_status; + EncounterFightStatus m_status{ EncounterFightStatus::IDLE }; }; } \ No newline at end of file diff --git a/src/world/Encounter/InstanceContent/IfritNormal.cpp b/src/world/Encounter/InstanceContent/IfritNormal.cpp index 8dd165dd..5fdae5dc 100644 --- a/src/world/Encounter/InstanceContent/IfritNormal.cpp +++ b/src/world/Encounter/InstanceContent/IfritNormal.cpp @@ -64,6 +64,8 @@ namespace Sapphire void init() override { + m_status = EncounterFightStatus::IDLE; + m_stateStack = std::make_shared< EncounterState::StateStack >(); // todo: i don't like this @@ -87,6 +89,8 @@ namespace Sapphire { auto ifritInitState = std::make_shared< IfritStateOne >( shared_from_this() ); addState( ifritInitState ); + + m_status = EncounterFightStatus::ACTIVE; } void update( double deltaTime ) override