mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity

encounter status control;

Browse source
This commit is contained in:
Alice Ogeda 2023-03-08 12:07:08 -03:00 • committed by Tahir
parent f8b0cfb05b
commit 69b767177e
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/world/Encounter/EncounterFight.h
View file

@ -67,6 +67,6 @@ namespace Sapphire
std::set< Entity::PlayerPtr > m_playerList; std::set< Entity::PlayerPtr > m_playerList;
std::unordered_map< uint32_t, Entity::BNpcPtr > m_bnpcs; std::unordered_map< uint32_t, Entity::BNpcPtr > m_bnpcs;
InstanceContentPtr m_pInstance; InstanceContentPtr m_pInstance;
EncounterFightStatus m_status; EncounterFightStatus m_status{ EncounterFightStatus::IDLE };
}; };
} }

4
src/world/Encounter/InstanceContent/IfritNormal.cpp
View file

@ -64,6 +64,8 @@ namespace Sapphire
void init() override void init() override
{ {
m_status = EncounterFightStatus::IDLE;
m_stateStack = std::make_shared< EncounterState::StateStack >(); m_stateStack = std::make_shared< EncounterState::StateStack >();
// todo: i don't like this // todo: i don't like this
@ -87,6 +89,8 @@ namespace Sapphire
{ {
auto ifritInitState = std::make_shared< IfritStateOne >( shared_from_this() ); auto ifritInitState = std::make_shared< IfritStateOne >( shared_from_this() );
addState( ifritInitState ); addState( ifritInitState );
m_status = EncounterFightStatus::ACTIVE;
} }
void update( double deltaTime ) override void update( double deltaTime ) override