mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-07 16:47:44 +00:00
Code Activity

Merge branch 'quest_scripts' of https://github.com/AussieGlenn/Sapphire into quest_scripts

Browse source 
# Conflicts:
#	src/scripts/quest/subquest/limsa/SubSea012.cpp
This commit is contained in:
AussieGlenn 2019-02-03 09:46:21 +10:00
commit 702f81ca3b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/scripts/quest/subquest/limsa/SubSea012.cpp
View file

@ -50,12 +50,12 @@ public:
{ {
}; };
void onTalk(uint32_t eventId, Entity::Player& player, uint64_t actorId) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto pEventMgr = m_framework->get< World::Manager::EventMgr >(); auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
auto actor = pEventMgr->mapEventActorToRealActor( static_cast<uint32_t>( actorId ) ); auto actor = pEventMgr->mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
if ( actor == Actor0 ) if( actor == Actor0 )
{ {
Scene00000( player ); Scene00000( player );
} }