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

fix quest_parser to use new service locator

Browse source
This commit is contained in:
NotAdam 2020-03-01 11:57:41 +11:00
parent f10d7938d7
commit 894c1016af
45 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/common/aethernet/Aetheryte.cpp
View file

@ -108,7 +108,7 @@ 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 exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref(); auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
auto aetherInfo = exdData.get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF ); auto aetherInfo = exdData.get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF );
if( !aetherInfo ) if( !aetherInfo )

2
src/scripts/common/warptaxi/WarpTaxi.cpp
View file

@ -75,7 +75,7 @@ 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 exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref(); auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
auto warp = exdData.get< Sapphire::Data::Warp >( eventId ); auto warp = exdData.get< Sapphire::Data::Warp >( eventId );
if( !warp ) if( !warp )

2
src/scripts/quest/ManFst001.cpp
View file

@ -96,7 +96,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )

2
src/scripts/quest/ManFst002.cpp
View file

@ -193,7 +193,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )

2
src/scripts/quest/ManFst003.cpp
View file

@ -82,7 +82,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/ManFst004.cpp
View file

@ -80,7 +80,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ManFst004::Actor0 ) if( actor == ManFst004::Actor0 )

2
src/scripts/quest/ManFst005.cpp
View file

@ -61,7 +61,7 @@ class ManFst005 : public Sapphire::ScriptAPI::EventScript
// Event Handlers // Event Handlers
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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/ManSea001.cpp
View file

@ -142,7 +142,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )

2
src/scripts/quest/ManSea002.cpp
View file

@ -48,7 +48,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )

2
src/scripts/quest/ManSea003.cpp
View file

@ -64,7 +64,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/ManWil001.cpp
View file

@ -174,7 +174,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )

2
src/scripts/quest/ManWil002.cpp
View file

@ -70,7 +70,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/ManWil003.cpp
View file

@ -70,7 +70,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/ManWil004.cpp
View file

@ -70,7 +70,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/gridania/SubFst002.cpp
View file

@ -59,7 +59,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 && !player.hasQuest( getId() ) ) if( actor == ACTOR0 && !player.hasQuest( getId() ) )

2
src/scripts/quest/subquest/gridania/SubFst004.cpp
View file

@ -56,7 +56,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/gridania/SubFst009.cpp
View file

@ -52,7 +52,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/gridania/SubFst010.cpp
View file

@ -55,7 +55,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )

4
src/scripts/quest/subquest/gridania/SubFst013.cpp
View file

@ -161,7 +161,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId() ) )
@ -182,7 +182,7 @@ public:
void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override
{ {
auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId() ) == SEQ_1 ) if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId() ) == SEQ_1 )

2
src/scripts/quest/subquest/gridania/SubFst014.cpp
View file

@ -56,7 +56,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 && !player.hasQuest( getId() ) ) if( actor == Actor0 && !player.hasQuest( getId() ) )

2
src/scripts/quest/subquest/gridania/SubFst019.cpp
View file

@ -49,7 +49,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/gridania/SubFst029.cpp
View file

@ -47,7 +47,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == SubFst029::Actor0 && !player.hasQuest( getId() ) ) if( actor == SubFst029::Actor0 && !player.hasQuest( getId() ) )

2
src/scripts/quest/subquest/gridania/SubFst039.cpp
View file

@ -42,7 +42,7 @@ class SubFst039 : public Sapphire::ScriptAPI::EventScript
// Event Handlers // Event Handlers
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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 && !player.hasQuest( getId() ) ) if( actor == Actor0 && !player.hasQuest( getId() ) )

2
src/scripts/quest/subquest/limsa/SubSea001.cpp
View file

@ -65,7 +65,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

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

@ -48,7 +48,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil000.cpp
View file

@ -48,7 +48,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil001.cpp
View file

@ -49,7 +49,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil002.cpp
View file

@ -53,7 +53,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil004.cpp
View file

@ -58,7 +58,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil006.cpp
View file

@ -51,7 +51,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

4
src/scripts/quest/subquest/uldah/SubWil007.cpp
View file

@ -55,7 +55,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 && !player.hasQuest( getId() ) ) if( actor == Actor0 && !player.hasQuest( getId() ) )
@ -90,7 +90,7 @@ public:
void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override
{ {
auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 && emoteId == 41 && player.getQuestSeq( getId() ) == Seq1 ) if( actor == Actor0 && emoteId == 41 && player.getQuestSeq( getId() ) == Seq1 )

2
src/scripts/quest/subquest/uldah/SubWil018.cpp
View file

@ -55,7 +55,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 && !player.hasQuest( getId() ) ) if( actor == Actor0 && !player.hasQuest( getId() ) )

2
src/scripts/quest/subquest/uldah/SubWil019.cpp
View file

@ -47,7 +47,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil020.cpp
View file

@ -63,7 +63,7 @@ class SubWil020 : public Sapphire::ScriptAPI::EventScript
// Event Handlers // Event Handlers
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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
/*player.setQuestUI8BH( getId(), 0 ); /*player.setQuestUI8BH( getId(), 0 );

2
src/scripts/quest/subquest/uldah/SubWil021.cpp
View file

@ -52,7 +52,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil022.cpp
View file

@ -52,7 +52,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil027.cpp
View file

@ -46,7 +46,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil028.cpp
View file

@ -48,7 +48,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

2
src/scripts/quest/subquest/uldah/SubWil029.cpp
View file

@ -51,7 +51,7 @@ 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 = Common::Service< World::Manager::EventMgr >::ref(); auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )

8
src/tools/quest_parser/main.cpp
View file

@ -27,8 +27,8 @@ using namespace Sapphire;
const std::string onTalkStr( const std::string onTalkStr(
" void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n" " void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n"
" {\n" " {\n"
" auto pEventMgr = m_framework->get< World::Manager::EventMgr >();\n" " auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();\n"
" auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n" " auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
" }\n\n" " }\n\n"
); );
@ -41,8 +41,8 @@ const std::string onWithinRangeStr(
const std::string onEmoteStr( const std::string onEmoteStr(
" void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId ) override\n" " void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId ) override\n"
" {\n" " {\n"
" auto pEventMgr = m_framework->get< World::Manager::EventMgr >();\n" " auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();\n"
" auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n" " auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
" }\n\n" " }\n\n"
); );

2
src/world/Actor/PlayerInventory.cpp
View file

@ -131,7 +131,7 @@ void Sapphire::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass )
void Sapphire::Entity::Player::equipSoulCrystal( ItemPtr pItem, bool updateJob ) void Sapphire::Entity::Player::equipSoulCrystal( ItemPtr pItem, bool updateJob )
{ {
auto exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref(); auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
auto itemInfo = exdData.get< Sapphire::Data::Item >( pItem->getId() ); auto itemInfo = exdData.get< Sapphire::Data::Item >( pItem->getId() );
auto itemClassJob = itemInfo->classJobUse; auto itemClassJob = itemInfo->classJobUse;

2
src/world/Manager/DebugCommandMgr.cpp
View file

@ -535,7 +535,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
void Sapphire::World::Manager::DebugCommandMgr::get( char* data, Entity::Player& player, void Sapphire::World::Manager::DebugCommandMgr::get( char* data, Entity::Player& player,
std::shared_ptr< DebugCommand > command ) std::shared_ptr< DebugCommand > command )
{ {
auto exdData = Common::Service< Data::ExdDataGenerated >::ref(); auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
std::string subCommand; std::string subCommand;
std::string params = ""; std::string params = "";

2
src/world/Manager/HousingMgr.cpp
View file

@ -869,7 +869,7 @@ void Sapphire::World::Manager::HousingMgr::sendEstateInventory( Entity::Player&
if( it == containers.end() ) if( it == containers.end() )
return; return;
auto invMgr = Common::Service< Manager::InventoryMgr >::ref(); auto& invMgr = Common::Service< Manager::InventoryMgr >::ref();
invMgr.sendInventoryContainer( player, it->second ); invMgr.sendInventoryContainer( player, it->second );
} }

2
src/world/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -190,7 +190,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
uint32_t emoteId = param11; uint32_t emoteId = param11;
bool isSilent = param2 == 1; bool isSilent = param2 == 1;
auto exdData = Common::Service< Data::ExdDataGenerated >::ref(); auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
auto emoteData = exdData.get< Data::Emote >( emoteId ); auto emoteData = exdData.get< Data::Emote >( emoteId );
if( !emoteData ) if( !emoteData )

2
src/world/Territory/HousingZone.cpp
View file

@ -63,7 +63,7 @@ bool Sapphire::HousingZone::init()
else if( m_territoryTypeId == 641 ) else if( m_territoryTypeId == 641 )
housingIndex = 3; housingIndex = 3;
auto exdData = Common::Service< Data::ExdDataGenerated >::ref(); auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
auto info = exdData.get< Sapphire::Data::HousingLandSet >( housingIndex ); auto info = exdData.get< Sapphire::Data::HousingLandSet >( housingIndex );
// build yard objects array indices // build yard objects array indices