From 1da2cce4da142da5235e22bdcfadd0f2b6142773 Mon Sep 17 00:00:00 2001 From: dude22072 Date: Wed, 19 Jan 2022 13:53:00 -0600 Subject: [PATCH] ARC clang cleanup --- .../quest/classquest/ARC/ClsArc000.cpp | 21 +-- .../quest/classquest/ARC/ClsArc001.cpp | 126 ++++++++-------- .../quest/classquest/ARC/ClsArc002.cpp | 134 ++++++++--------- .../quest/classquest/ARC/ClsArc003.cpp | 136 +++++++++--------- .../quest/classquest/ARC/ClsArc004.cpp | 102 ++++++------- .../quest/classquest/ARC/ClsArc005.cpp | 2 +- .../quest/classquest/ARC/ClsArc006.cpp | 76 +++++----- .../quest/classquest/ARC/ClsArc100.cpp | 14 +- .../quest/classquest/ARC/ClsArc997.cpp | 132 ++++++++--------- .../quest/classquest/ARC/ClsArc998.cpp | 10 +- .../quest/classquest/ARC/ClsArc999.cpp | 6 +- 11 files changed, 380 insertions(+), 379 deletions(-) diff --git a/src/scripts/quest/classquest/ARC/ClsArc000.cpp b/src/scripts/quest/classquest/ARC/ClsArc000.cpp index 9a75c32c..224f61d6 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc000.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc000.cpp @@ -59,13 +59,14 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { case Actor0: { - Scene00000( quest, player ); + if( quest.getSeq() == Seq0 ) + Scene00000( quest, player ); break; } case Actor1: @@ -79,7 +80,7 @@ public: } } - void onBNpcKill( World::Quest &quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player &player ) override + void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override { if( nameId != Enemy0 && nameId != Enemy1 && nameId != Enemy2 ) return; @@ -141,7 +142,7 @@ public: } private: - void checkQuestCompletion( World::Quest &quest, Entity::Player &player, uint32_t varIdx ) + void checkQuestCompletion( World::Quest& quest, Entity::Player& player, uint32_t varIdx ) { if( varIdx == 1 ) eventMgr().sendEventNotice( player, getId(), 1, 0, 0, 0 ); @@ -164,12 +165,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ClsArc000::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -179,12 +180,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ClsArc000::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) { @@ -195,12 +196,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00002( World::Quest &quest, Entity::Player &player ) + void Scene00002( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &ClsArc000::Scene00002Return ) ); } - void Scene00002Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) diff --git a/src/scripts/quest/classquest/ARC/ClsArc001.cpp b/src/scripts/quest/classquest/ARC/ClsArc001.cpp index 11649044..9f8872e5 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc001.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc001.cpp @@ -61,13 +61,13 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { case Actor0: { - if( !player.hasQuest( getId() ) ) + if( quest.getSeq() == Seq0 ) Scene00000( quest, player ); if( quest.getSeq() == Seq2 ) Scene00025( quest, player ); @@ -79,7 +79,7 @@ public: } } - void onBNpcKill( World::Quest &quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player &player ) override + void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override { if( nameId != Enemy0 && nameId != Enemy1 ) return; @@ -124,7 +124,7 @@ public: } } - void onEObjHit( World::Quest &quest, Sapphire::Entity::Player &player, uint64_t actorId, uint32_t actionId ) override + void onEObjHit( World::Quest& quest, Sapphire::Entity::Player& player, uint64_t actorId, uint32_t actionId ) override { auto actor = eventMgr().mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); @@ -166,7 +166,7 @@ public: } private: - void checkQuestCompletion( World::Quest &quest, Entity::Player &player, uint32_t varIdx ) + void checkQuestCompletion( World::Quest& quest, Entity::Player& player, uint32_t varIdx ) { if( varIdx == 1 ) { @@ -200,12 +200,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -215,12 +215,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 1, true ); @@ -228,12 +228,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00002( World::Quest &quest, Entity::Player &player ) + void Scene00002( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00002Return ) ); } - void Scene00002Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 2, true ); @@ -241,12 +241,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00003( World::Quest &quest, Entity::Player &player ) + void Scene00003( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 3, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00003Return ) ); } - void Scene00003Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 3, true ); @@ -254,12 +254,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00004( World::Quest &quest, Entity::Player &player ) + void Scene00004( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00004Return ) ); } - void Scene00004Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 4, true ); @@ -267,12 +267,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00005( World::Quest &quest, Entity::Player &player ) + void Scene00005( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 5, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00005Return ) ); } - void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 5, true ); @@ -280,12 +280,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00006( World::Quest &quest, Entity::Player &player ) + void Scene00006( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00006Return ) ); } - void Scene00006Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 6, true ); @@ -293,12 +293,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00007( World::Quest &quest, Entity::Player &player ) + void Scene00007( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00007Return ) ); } - void Scene00007Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 7, true ); @@ -306,12 +306,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00008( World::Quest &quest, Entity::Player &player ) + void Scene00008( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 8, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00008Return ) ); } - void Scene00008Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 8, true ); @@ -319,204 +319,204 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00009( World::Quest &quest, Entity::Player &player ) + void Scene00009( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 9, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00009Return ) ); } - void Scene00009Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00010( World::Quest &quest, Entity::Player &player ) + void Scene00010( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 10, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00010Return ) ); } - void Scene00010Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00010Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00011( World::Quest &quest, Entity::Player &player ) + void Scene00011( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 11, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00011Return ) ); } - void Scene00011Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00012( World::Quest &quest, Entity::Player &player ) + void Scene00012( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 12, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00012Return ) ); } - void Scene00012Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00013( World::Quest &quest, Entity::Player &player ) + void Scene00013( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 13, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00013Return ) ); } - void Scene00013Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00014( World::Quest &quest, Entity::Player &player ) + void Scene00014( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 14, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00014Return ) ); } - void Scene00014Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00014Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00015( World::Quest &quest, Entity::Player &player ) + void Scene00015( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 15, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00015Return ) ); } - void Scene00015Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00016( World::Quest &quest, Entity::Player &player ) + void Scene00016( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 16, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00016Return ) ); } - void Scene00016Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00016Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00017( World::Quest &quest, Entity::Player &player ) + void Scene00017( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 17, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00017Return ) ); } - void Scene00017Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00017Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00018( World::Quest &quest, Entity::Player &player ) + void Scene00018( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 18, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00018Return ) ); } - void Scene00018Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00018Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00019( World::Quest &quest, Entity::Player &player ) + void Scene00019( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 19, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00019Return ) ); } - void Scene00019Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00020( World::Quest &quest, Entity::Player &player ) + void Scene00020( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 20, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00020Return ) ); } - void Scene00020Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00020Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00021( World::Quest &quest, Entity::Player &player ) + void Scene00021( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 21, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00021Return ) ); } - void Scene00021Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00022( World::Quest &quest, Entity::Player &player ) + void Scene00022( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 22, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00022Return ) ); } - void Scene00022Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00022Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00023( World::Quest &quest, Entity::Player &player ) + void Scene00023( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 23, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00023Return ) ); } - void Scene00023Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00023Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00024( World::Quest &quest, Entity::Player &player ) + void Scene00024( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 24, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00024Return ) ); } - void Scene00024Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00024Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00025( World::Quest &quest, Entity::Player &player ) + void Scene00025( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 25, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00025Return ) ); } - void Scene00025Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00025Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 1 ); quest.setSeq( Seq3 ); @@ -524,36 +524,36 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00026( World::Quest &quest, Entity::Player &player ) + void Scene00026( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 26, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00026Return ) ); } - void Scene00026Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00026Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00027( World::Quest &quest, Entity::Player &player ) + void Scene00027( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 27, HIDE_HOTBAR, bindSceneReturn( &ClsArc001::Scene00027Return ) ); } - void Scene00027Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00027Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00028( World::Quest &quest, Entity::Player &player ) + void Scene00028( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 28, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ | CONDITION_CUTSCENE /*FADE_OUT | CONDITION_CUTSCENE | HIDE_UI*/, bindSceneReturn( &ClsArc001::Scene00028Return ) ); } - void Scene00028Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00028Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) diff --git a/src/scripts/quest/classquest/ARC/ClsArc002.cpp b/src/scripts/quest/classquest/ARC/ClsArc002.cpp index 8fc83fd7..e4c33575 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc002.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc002.cpp @@ -69,13 +69,13 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { case Actor0: { - if( !player.hasQuest( getId() ) ) + if( quest.getSeq() == Seq0 ) Scene00000( quest, player ); else if( quest.getSeq() == SeqFinish ) Scene00030( quest, player ); @@ -100,7 +100,7 @@ public: } } - void onBNpcKill( World::Quest &quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player &player ) override + void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override { if( entityId != Enemy0 && entityId != Enemy1 ) return; @@ -145,7 +145,7 @@ public: } } - void onEObjHit( World::Quest &quest, Sapphire::Entity::Player &player, uint64_t actorId, uint32_t actionId ) override + void onEObjHit( World::Quest& quest, Sapphire::Entity::Player& player, uint64_t actorId, uint32_t actionId ) override { switch( actorId ) { @@ -201,7 +201,7 @@ public: } private: - void checkQuestCompletion( World::Quest &quest, Entity::Player &player, uint32_t varIdx ) + void checkQuestCompletion( World::Quest& quest, Entity::Player& player, uint32_t varIdx ) { if( varIdx == 1 ) { @@ -237,12 +237,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -252,12 +252,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setSeq( Seq2 ); eventMgr().sendEventNotice( player, getId(), 0, 2, 0, 0 ); @@ -265,12 +265,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00002( World::Quest &quest, Entity::Player &player ) + void Scene00002( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00002Return ) ); } - void Scene00002Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 1, true ); @@ -278,12 +278,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00003( World::Quest &quest, Entity::Player &player ) + void Scene00003( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 3, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00003Return ) ); } - void Scene00003Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 2, true ); @@ -291,12 +291,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00004( World::Quest &quest, Entity::Player &player ) + void Scene00004( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00004Return ) ); } - void Scene00004Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 3, true ); @@ -304,12 +304,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00005( World::Quest &quest, Entity::Player &player ) + void Scene00005( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 5, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00005Return ) ); } - void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 4, true ); @@ -317,12 +317,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00006( World::Quest &quest, Entity::Player &player ) + void Scene00006( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00006Return ) ); } - void Scene00006Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 5, true ); @@ -330,12 +330,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00007( World::Quest &quest, Entity::Player &player ) + void Scene00007( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00007Return ) ); } - void Scene00007Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 6, true ); @@ -343,12 +343,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00008( World::Quest &quest, Entity::Player &player ) + void Scene00008( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 8, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00008Return ) ); } - void Scene00008Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 7, true ); @@ -356,12 +356,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00009( World::Quest &quest, Entity::Player &player ) + void Scene00009( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 9, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00009Return ) ); } - void Scene00009Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 8, true ); @@ -369,240 +369,240 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00010( World::Quest &quest, Entity::Player &player ) + void Scene00010( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 10, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00010Return ) ); } - void Scene00010Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00010Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00011( World::Quest &quest, Entity::Player &player ) + void Scene00011( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 11, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00011Return ) ); } - void Scene00011Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00012( World::Quest &quest, Entity::Player &player ) + void Scene00012( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 12, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00012Return ) ); } - void Scene00012Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00013( World::Quest &quest, Entity::Player &player ) + void Scene00013( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 13, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00013Return ) ); } - void Scene00013Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00014( World::Quest &quest, Entity::Player &player ) + void Scene00014( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 14, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00014Return ) ); } - void Scene00014Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00014Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00015( World::Quest &quest, Entity::Player &player ) + void Scene00015( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 15, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00015Return ) ); } - void Scene00015Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00016( World::Quest &quest, Entity::Player &player ) + void Scene00016( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 16, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00016Return ) ); } - void Scene00016Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00016Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00017( World::Quest &quest, Entity::Player &player ) + void Scene00017( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 17, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00017Return ) ); } - void Scene00017Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00017Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00018( World::Quest &quest, Entity::Player &player ) + void Scene00018( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 18, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00018Return ) ); } - void Scene00018Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00018Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00019( World::Quest &quest, Entity::Player &player ) + void Scene00019( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 19, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00019Return ) ); } - void Scene00019Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00020( World::Quest &quest, Entity::Player &player ) + void Scene00020( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 20, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00020Return ) ); } - void Scene00020Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00020Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00021( World::Quest &quest, Entity::Player &player ) + void Scene00021( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 21, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00021Return ) ); } - void Scene00021Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00022( World::Quest &quest, Entity::Player &player ) + void Scene00022( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 22, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00022Return ) ); } - void Scene00022Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00022Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00023( World::Quest &quest, Entity::Player &player ) + void Scene00023( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 23, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00023Return ) ); } - void Scene00023Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00023Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00024( World::Quest &quest, Entity::Player &player ) + void Scene00024( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 24, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00024Return ) ); } - void Scene00024Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00024Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00025( World::Quest &quest, Entity::Player &player ) + void Scene00025( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 25, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00025Return ) ); } - void Scene00025Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00025Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00026( World::Quest &quest, Entity::Player &player ) + void Scene00026( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 26, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00026Return ) ); } - void Scene00026Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00026Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00027( World::Quest &quest, Entity::Player &player ) + void Scene00027( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 27, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00027Return ) ); } - void Scene00027Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00027Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00028( World::Quest &quest, Entity::Player &player ) + void Scene00028( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 28, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00028Return ) ); } - void Scene00028Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00028Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00029( World::Quest &quest, Entity::Player &player ) + void Scene00029( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 29, HIDE_HOTBAR, bindSceneReturn( &ClsArc002::Scene00029Return ) ); } - void Scene00029Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00029Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 5, 2, 0, 0 ); quest.setSeq( SeqFinish ); @@ -610,12 +610,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00030( World::Quest &quest, Entity::Player &player ) + void Scene00030( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 30, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ClsArc002::Scene00030Return ) ); } - void Scene00030Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00030Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) { diff --git a/src/scripts/quest/classquest/ARC/ClsArc003.cpp b/src/scripts/quest/classquest/ARC/ClsArc003.cpp index 636650c6..02757ce5 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc003.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc003.cpp @@ -71,13 +71,13 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { case Actor0: { - if( !player.hasQuest( getId() ) ) + if( quest.getSeq() == Seq0 ) Scene00000( quest, player ); else if( quest.getSeq() == SeqFinish ) { @@ -112,7 +112,7 @@ public: } - void onEObjHit( World::Quest &quest, Sapphire::Entity::Player &player, uint64_t actorId, uint32_t actionId ) override + void onEObjHit( World::Quest& quest, Sapphire::Entity::Player& player, uint64_t actorId, uint32_t actionId ) override { auto actor = eventMgr().mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); @@ -170,7 +170,7 @@ public: } private: - void checkQuestCompletion( World::Quest &quest, Entity::Player &player ) + void checkQuestCompletion( World::Quest& quest, Entity::Player& player ) { auto currentCC = quest.getUI8AL(); @@ -190,12 +190,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -205,12 +205,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 0, 2, 0, 0 ); quest.setSeq( Seq2 ); @@ -218,12 +218,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00002( World::Quest &quest, Entity::Player &player ) + void Scene00002( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00002Return ) ); } - void Scene00002Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player ); quest.setBitFlag8( 1, true ); @@ -231,12 +231,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00003( World::Quest &quest, Entity::Player &player ) + void Scene00003( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 3, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00003Return ) ); } - void Scene00003Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player ); quest.setBitFlag8( 2, true ); @@ -244,12 +244,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00004( World::Quest &quest, Entity::Player &player ) + void Scene00004( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00004Return ) ); } - void Scene00004Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player ); quest.setBitFlag8( 3, true ); @@ -257,12 +257,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00005( World::Quest &quest, Entity::Player &player ) + void Scene00005( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 5, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00005Return ) ); } - void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player ); quest.setBitFlag8( 4, true ); @@ -270,12 +270,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00006( World::Quest &quest, Entity::Player &player ) + void Scene00006( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00006Return ) ); } - void Scene00006Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player ); quest.setBitFlag8( 5, true ); @@ -283,12 +283,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00007( World::Quest &quest, Entity::Player &player ) + void Scene00007( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00007Return ) ); } - void Scene00007Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player ); quest.setBitFlag8( 6, true ); @@ -296,12 +296,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00008( World::Quest &quest, Entity::Player &player ) + void Scene00008( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 8, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00008Return ) ); } - void Scene00008Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player ); quest.setBitFlag8( 7, true ); @@ -309,12 +309,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00009( World::Quest &quest, Entity::Player &player ) + void Scene00009( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 9, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00009Return ) ); } - void Scene00009Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player ); quest.setBitFlag8( 8, true ); @@ -322,204 +322,204 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00010( World::Quest &quest, Entity::Player &player ) + void Scene00010( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 10, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00010Return ) ); } - void Scene00010Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00010Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00011( World::Quest &quest, Entity::Player &player ) + void Scene00011( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 11, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00011Return ) ); } - void Scene00011Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00012( World::Quest &quest, Entity::Player &player ) + void Scene00012( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 12, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00012Return ) ); } - void Scene00012Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00013( World::Quest &quest, Entity::Player &player ) + void Scene00013( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 13, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00013Return ) ); } - void Scene00013Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00014( World::Quest &quest, Entity::Player &player ) + void Scene00014( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 14, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00014Return ) ); } - void Scene00014Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00014Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00015( World::Quest &quest, Entity::Player &player ) + void Scene00015( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 15, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00015Return ) ); } - void Scene00015Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00016( World::Quest &quest, Entity::Player &player ) + void Scene00016( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 16, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00016Return ) ); } - void Scene00016Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00016Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00017( World::Quest &quest, Entity::Player &player ) + void Scene00017( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 17, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00017Return ) ); } - void Scene00017Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00017Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00018( World::Quest &quest, Entity::Player &player ) + void Scene00018( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 18, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00018Return ) ); } - void Scene00018Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00018Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00019( World::Quest &quest, Entity::Player &player ) + void Scene00019( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 19, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00019Return ) ); } - void Scene00019Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00020( World::Quest &quest, Entity::Player &player ) + void Scene00020( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 20, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00020Return ) ); } - void Scene00020Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00020Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00021( World::Quest &quest, Entity::Player &player ) + void Scene00021( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 21, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00021Return ) ); } - void Scene00021Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00022( World::Quest &quest, Entity::Player &player ) + void Scene00022( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 22, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00022Return ) ); } - void Scene00022Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00022Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00023( World::Quest &quest, Entity::Player &player ) + void Scene00023( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 23, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00023Return ) ); } - void Scene00023Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00023Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00024( World::Quest &quest, Entity::Player &player ) + void Scene00024( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 24, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00024Return ) ); } - void Scene00024Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00024Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00025( World::Quest &quest, Entity::Player &player ) + void Scene00025( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 25, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00025Return ) ); } - void Scene00025Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00025Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00026( World::Quest &quest, Entity::Player &player ) + void Scene00026( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 26, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00026Return ) ); } - void Scene00026Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00026Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setUI8AL( 0 ); eventMgr().sendEventNotice( player, getId(), 2, 2, 0, 0 ); @@ -528,24 +528,24 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00027( World::Quest &quest, Entity::Player &player ) + void Scene00027( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 27, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00027Return ) ); } - void Scene00027Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00027Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { Scene00028( quest, player ); } ////////////////////////////////////////////////////////////////////// - void Scene00028( World::Quest &quest, Entity::Player &player ) + void Scene00028( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 28, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00028Return ) ); } - void Scene00028Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00028Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) { @@ -563,24 +563,24 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00029( World::Quest &quest, Entity::Player &player ) + void Scene00029( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 29, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00029Return ) ); } - void Scene00029Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00029Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00030( World::Quest &quest, Entity::Player &player ) + void Scene00030( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 30, HIDE_HOTBAR, bindSceneReturn( &ClsArc003::Scene00030Return ) ); } - void Scene00030Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00030Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 4, 2, 0, 0 ); quest.setSeq( SeqFinish ); @@ -588,12 +588,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00031( World::Quest &quest, Entity::Player &player ) + void Scene00031( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 31, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ClsArc003::Scene00031Return ) ); } - void Scene00031Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00031Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) diff --git a/src/scripts/quest/classquest/ARC/ClsArc004.cpp b/src/scripts/quest/classquest/ARC/ClsArc004.cpp index 0bac94dc..2b464f21 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc004.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc004.cpp @@ -69,7 +69,7 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { @@ -115,7 +115,7 @@ public: { eventMgr().eventActionStart( player, getId(), 0x07, - [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) { Scene00003( quest, player ); }, nullptr, 0 ); @@ -125,7 +125,7 @@ public: { eventMgr().eventActionStart( player, getId(), 0x07, - [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) { Scene00004( quest, player ); }, nullptr, 0 ); @@ -135,7 +135,7 @@ public: { eventMgr().eventActionStart( player, getId(), 0x07, - [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) { Scene00005( quest, player ); }, nullptr, 0 ); @@ -145,7 +145,7 @@ public: { eventMgr().eventActionStart( player, getId(), 0x0A, - [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) { Scene00013( quest, player ); eventMgr().sendEventNotice( player, getId(), 2, 2, 0, 0 ); }, @@ -156,7 +156,7 @@ public: { eventMgr().eventActionStart( player, getId(), 0x01, - [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) { Scene00015( quest, player ); }, nullptr, 0 ); @@ -167,7 +167,7 @@ public: private: - void checkQuestCompletion( World::Quest &quest, Entity::Player &player ) + void checkQuestCompletion( World::Quest& quest, Entity::Player& player ) { auto currentCC = quest.getUI8AL(); @@ -188,12 +188,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -203,24 +203,24 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ClsArc004::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setSeq( Seq1 ); } ////////////////////////////////////////////////////////////////////// - void Scene00002( World::Quest &quest, Entity::Player &player ) + void Scene00002( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 2, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ClsArc004::Scene00002Return ) ); } - void Scene00002Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 0, 2, 0, 0 ); quest.setSeq( Seq2 ); @@ -228,12 +228,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00003( World::Quest &quest, Entity::Player &player ) + void Scene00003( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 3, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00003Return ) ); } - void Scene00003Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setBitFlag8( 1, true ); checkQuestCompletion( quest, player ); @@ -241,12 +241,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00004( World::Quest &quest, Entity::Player &player ) + void Scene00004( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00004Return ) ); } - void Scene00004Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setBitFlag8( 2, true ); checkQuestCompletion( quest, player ); @@ -254,12 +254,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00005( World::Quest &quest, Entity::Player &player ) + void Scene00005( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 5, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00005Return ) ); } - void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setBitFlag8( 3, true ); checkQuestCompletion( quest, player ); @@ -267,132 +267,132 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00006( World::Quest &quest, Entity::Player &player ) + void Scene00006( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00006Return ) ); } - void Scene00006Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00007( World::Quest &quest, Entity::Player &player ) + void Scene00007( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00007Return ) ); } - void Scene00007Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00008( World::Quest &quest, Entity::Player &player ) + void Scene00008( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 8, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00008Return ) ); } - void Scene00008Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00009( World::Quest &quest, Entity::Player &player ) + void Scene00009( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 9, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00009Return ) ); } - void Scene00009Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00010( World::Quest &quest, Entity::Player &player ) + void Scene00010( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 10, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00010Return ) ); } - void Scene00010Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00010Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00011( World::Quest &quest, Entity::Player &player ) + void Scene00011( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 11, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00011Return ) ); } - void Scene00011Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00012( World::Quest &quest, Entity::Player &player ) + void Scene00012( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 12, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00012Return ) ); } - void Scene00012Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00013( World::Quest &quest, Entity::Player &player ) + void Scene00013( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 13, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ClsArc004::Scene00013Return ) ); } - void Scene00013Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setSeq( Seq4 ); } ////////////////////////////////////////////////////////////////////// - void Scene00014( World::Quest &quest, Entity::Player &player ) + void Scene00014( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 14, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00014Return ) ); } - void Scene00014Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00014Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00015( World::Quest &quest, Entity::Player &player ) + void Scene00015( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 15, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00015Return ) ); } - void Scene00015Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { Scene00016( quest, player ); } ////////////////////////////////////////////////////////////////////// - void Scene00016( World::Quest &quest, Entity::Player &player ) + void Scene00016( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 16, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00016Return ) ); } - void Scene00016Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00016Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) { @@ -413,24 +413,24 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00017( World::Quest &quest, Entity::Player &player ) + void Scene00017( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 17, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00017Return ) ); } - void Scene00017Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00017Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00018( World::Quest &quest, Entity::Player &player ) + void Scene00018( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 18, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00018Return ) ); } - void Scene00018Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00018Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 4, 2, 0, 0 ); quest.setSeq( SeqFinish ); @@ -438,36 +438,36 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00019( World::Quest &quest, Entity::Player &player ) + void Scene00019( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 19, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00019Return ) ); } - void Scene00019Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00020( World::Quest &quest, Entity::Player &player ) + void Scene00020( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 20, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00020Return ) ); } - void Scene00020Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00020Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { //Empty } ////////////////////////////////////////////////////////////////////// - void Scene00021( World::Quest &quest, Entity::Player &player ) + void Scene00021( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 21, HIDE_HOTBAR, bindSceneReturn( &ClsArc004::Scene00021Return ) ); } - void Scene00021Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) diff --git a/src/scripts/quest/classquest/ARC/ClsArc005.cpp b/src/scripts/quest/classquest/ARC/ClsArc005.cpp index 064fc35e..3580f370 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc005.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc005.cpp @@ -72,7 +72,7 @@ public: { case Actor0: { - if( !player.hasQuest( getId() ) ) + if( quest.getSeq() == Seq0 ) Scene00000( quest, player ); else if( quest.getSeq() == SeqFinish ) Scene00010( quest, player ); diff --git a/src/scripts/quest/classquest/ARC/ClsArc006.cpp b/src/scripts/quest/classquest/ARC/ClsArc006.cpp index 0780f0c4..b454f5ca 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc006.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc006.cpp @@ -70,13 +70,13 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { case Actor0: { - if( !player.hasQuest( getId() ) ) + if( quest.getSeq() == Seq0 ) Scene00000( quest, player ); else if( quest.getSeq() == SeqFinish ) Scene00013( quest, player ); @@ -135,7 +135,7 @@ public: { eventMgr().eventActionStart( player, getId(), 0x1B, - [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) { Scene00011( quest, player ); }, nullptr, 0 ); @@ -151,12 +151,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -166,24 +166,24 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ClsArc006::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setSeq( Seq1 ); } ////////////////////////////////////////////////////////////////////// - void Scene00002( World::Quest &quest, Entity::Player &player ) + void Scene00002( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00002Return ) ); } - void Scene00002Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) { @@ -200,100 +200,100 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00003( World::Quest &quest, Entity::Player &player ) + void Scene00003( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 3, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00003Return ) ); } - void Scene00003Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00004( World::Quest &quest, Entity::Player &player ) + void Scene00004( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00004Return ) ); } - void Scene00004Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00005( World::Quest &quest, Entity::Player &player ) + void Scene00005( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 5, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00005Return ) ); } - void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00006( World::Quest &quest, Entity::Player &player ) + void Scene00006( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00006Return ) ); } - void Scene00006Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00007( World::Quest &quest, Entity::Player &player ) + void Scene00007( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00007Return ) ); } - void Scene00007Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00008( World::Quest &quest, Entity::Player &player ) + void Scene00008( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 8, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00008Return ) ); } - void Scene00008Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00009( World::Quest &quest, Entity::Player &player ) + void Scene00009( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 9, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00009Return ) ); } - void Scene00009Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00010( World::Quest &quest, Entity::Player &player ) + void Scene00010( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 10, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00010Return ) ); } - void Scene00010Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00010Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00011( World::Quest &quest, Entity::Player &player ) + void Scene00011( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 11, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00011Return ) ); } - void Scene00011Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) { @@ -301,7 +301,7 @@ private: playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." ); eventMgr().sendEventNotice( player, getId(), 3, 0 ); quest.setSeq( SeqFinish ); - /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); + /*auto pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); eventMgr().eventFinish(player, result.eventId, 0); pTeriMgr.createAndJoinQuestBattle(player, Questbattle1);*/ @@ -310,23 +310,23 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00012( World::Quest &quest, Entity::Player &player ) + void Scene00012( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 12, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00012Return ) ); } - void Scene00012Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00013( World::Quest &quest, Entity::Player &player ) + void Scene00013( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 13, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ClsArc006::Scene00013Return ) ); } - void Scene00013Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) @@ -337,34 +337,34 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00014( World::Quest &quest, Entity::Player &player ) + void Scene00014( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 14, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00014Return ) ); } - void Scene00014Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00014Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00015( World::Quest &quest, Entity::Player &player ) + void Scene00015( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 15, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00015Return ) ); } - void Scene00015Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00016( World::Quest &quest, Entity::Player &player ) + void Scene00016( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 16, HIDE_HOTBAR, bindSceneReturn( &ClsArc006::Scene00016Return ) ); } - void Scene00016Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00016Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } }; diff --git a/src/scripts/quest/classquest/ARC/ClsArc100.cpp b/src/scripts/quest/classquest/ARC/ClsArc100.cpp index 4437e9e4..b3ee39ab 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc100.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc100.cpp @@ -51,7 +51,7 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { @@ -66,7 +66,7 @@ public: } } - void onBNpcKill( World::Quest &quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player &player ) override + void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override { if( nameId != Enemy0 && nameId != Enemy1 && nameId != Enemy2 ) return; @@ -130,7 +130,7 @@ public: } private: - void checkQuestCompletion( World::Quest &quest, Entity::Player &player ) + void checkQuestCompletion( World::Quest& quest, Entity::Player& player ) { auto currentKC37 = quest.getUI8AL(); auto currentKC49 = quest.getUI8BH(); @@ -149,12 +149,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, NONE, bindSceneReturn( &ClsArc100::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -164,12 +164,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, NONE, bindSceneReturn( &ClsArc100::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) diff --git a/src/scripts/quest/classquest/ARC/ClsArc997.cpp b/src/scripts/quest/classquest/ARC/ClsArc997.cpp index 818b88cc..c8f7277b 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc997.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc997.cpp @@ -66,7 +66,7 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { @@ -95,7 +95,7 @@ public: } } - void onBNpcKill( World::Quest &quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player &player ) override + void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override { if( nameId != Enemy0 && nameId != Enemy1 ) return; @@ -140,7 +140,7 @@ public: } } - void onEObjHit( World::Quest &quest, Sapphire::Entity::Player &player, uint64_t actorId, uint32_t actionId ) override + void onEObjHit( World::Quest& quest, Sapphire::Entity::Player& player, uint64_t actorId, uint32_t actionId ) override { auto actor = eventMgr().mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); @@ -183,7 +183,7 @@ public: } private: - void checkQuestCompletion( World::Quest &quest, Entity::Player &player, uint32_t varIdx ) + void checkQuestCompletion( World::Quest& quest, Entity::Player& player, uint32_t varIdx ) { if( varIdx == 1 ) { @@ -217,12 +217,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, NONE, bindSceneReturn( &ClsArc997::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -232,12 +232,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, NONE, bindSceneReturn( &ClsArc997::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 1, 0 ); quest.setSeq( Seq2 ); @@ -245,12 +245,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00002( World::Quest &quest, Entity::Player &player ) + void Scene00002( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 2, NONE, bindSceneReturn( &ClsArc997::Scene00002Return ) ); } - void Scene00002Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 1, true ); @@ -258,12 +258,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00003( World::Quest &quest, Entity::Player &player ) + void Scene00003( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 3, NONE, bindSceneReturn( &ClsArc997::Scene00003Return ) ); } - void Scene00003Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 2, true ); @@ -271,12 +271,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00004( World::Quest &quest, Entity::Player &player ) + void Scene00004( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 4, NONE, bindSceneReturn( &ClsArc997::Scene00004Return ) ); } - void Scene00004Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 3, true ); @@ -284,12 +284,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00005( World::Quest &quest, Entity::Player &player ) + void Scene00005( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 5, NONE, bindSceneReturn( &ClsArc997::Scene00005Return ) ); } - void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 4, true ); @@ -297,12 +297,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00006( World::Quest &quest, Entity::Player &player ) + void Scene00006( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 6, NONE, bindSceneReturn( &ClsArc997::Scene00006Return ) ); } - void Scene00006Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 5, true ); @@ -310,12 +310,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00007( World::Quest &quest, Entity::Player &player ) + void Scene00007( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 7, NONE, bindSceneReturn( &ClsArc997::Scene00007Return ) ); } - void Scene00007Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 6, true ); @@ -323,12 +323,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00008( World::Quest &quest, Entity::Player &player ) + void Scene00008( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 8, NONE, bindSceneReturn( &ClsArc997::Scene00008Return ) ); } - void Scene00008Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 7, true ); @@ -336,12 +336,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00009( World::Quest &quest, Entity::Player &player ) + void Scene00009( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 9, NONE, bindSceneReturn( &ClsArc997::Scene00009Return ) ); } - void Scene00009Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { checkQuestCompletion( quest, player, 1 ); quest.setBitFlag8( 8, true ); @@ -349,188 +349,188 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00010( World::Quest &quest, Entity::Player &player ) + void Scene00010( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 10, NONE, bindSceneReturn( &ClsArc997::Scene00010Return ) ); } - void Scene00010Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00010Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00011( World::Quest &quest, Entity::Player &player ) + void Scene00011( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 11, NONE, bindSceneReturn( &ClsArc997::Scene00011Return ) ); } - void Scene00011Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00012( World::Quest &quest, Entity::Player &player ) + void Scene00012( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 12, NONE, bindSceneReturn( &ClsArc997::Scene00012Return ) ); } - void Scene00012Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00013( World::Quest &quest, Entity::Player &player ) + void Scene00013( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 13, NONE, bindSceneReturn( &ClsArc997::Scene00013Return ) ); } - void Scene00013Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00014( World::Quest &quest, Entity::Player &player ) + void Scene00014( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 14, NONE, bindSceneReturn( &ClsArc997::Scene00014Return ) ); } - void Scene00014Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00014Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00015( World::Quest &quest, Entity::Player &player ) + void Scene00015( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 15, NONE, bindSceneReturn( &ClsArc997::Scene00015Return ) ); } - void Scene00015Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00016( World::Quest &quest, Entity::Player &player ) + void Scene00016( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 16, NONE, bindSceneReturn( &ClsArc997::Scene00016Return ) ); } - void Scene00016Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00016Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00017( World::Quest &quest, Entity::Player &player ) + void Scene00017( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 17, NONE, bindSceneReturn( &ClsArc997::Scene00017Return ) ); } - void Scene00017Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00017Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00018( World::Quest &quest, Entity::Player &player ) + void Scene00018( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 18, NONE, bindSceneReturn( &ClsArc997::Scene00018Return ) ); } - void Scene00018Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00018Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00019( World::Quest &quest, Entity::Player &player ) + void Scene00019( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 19, NONE, bindSceneReturn( &ClsArc997::Scene00019Return ) ); } - void Scene00019Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00020( World::Quest &quest, Entity::Player &player ) + void Scene00020( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 20, NONE, bindSceneReturn( &ClsArc997::Scene00020Return ) ); } - void Scene00020Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00020Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00021( World::Quest &quest, Entity::Player &player ) + void Scene00021( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 21, NONE, bindSceneReturn( &ClsArc997::Scene00021Return ) ); } - void Scene00021Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00022( World::Quest &quest, Entity::Player &player ) + void Scene00022( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 22, NONE, bindSceneReturn( &ClsArc997::Scene00022Return ) ); } - void Scene00022Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00022Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00023( World::Quest &quest, Entity::Player &player ) + void Scene00023( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 23, NONE, bindSceneReturn( &ClsArc997::Scene00023Return ) ); } - void Scene00023Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00023Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00024( World::Quest &quest, Entity::Player &player ) + void Scene00024( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 24, NONE, bindSceneReturn( &ClsArc997::Scene00024Return ) ); } - void Scene00024Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00024Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00025( World::Quest &quest, Entity::Player &player ) + void Scene00025( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 25, NONE, bindSceneReturn( &ClsArc997::Scene00025Return ) ); } - void Scene00025Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00025Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00026( World::Quest &quest, Entity::Player &player ) + void Scene00026( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 26, NONE, bindSceneReturn( &ClsArc997::Scene00026Return ) ); } - void Scene00026Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00026Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 2, 0 ); quest.setSeq( Seq4 ); @@ -538,34 +538,34 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00027( World::Quest &quest, Entity::Player &player ) + void Scene00027( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 27, NONE, bindSceneReturn( &ClsArc997::Scene00027Return ) ); } - void Scene00027Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00027Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00028( World::Quest &quest, Entity::Player &player ) + void Scene00028( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 28, NONE, bindSceneReturn( &ClsArc997::Scene00028Return ) ); } - void Scene00028Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00028Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { } ////////////////////////////////////////////////////////////////////// - void Scene00029( World::Quest &quest, Entity::Player &player ) + void Scene00029( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 29, NONE, bindSceneReturn( &ClsArc997::Scene00029Return ) ); } - void Scene00029Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00029Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { eventMgr().sendEventNotice( player, getId(), 5, 0 ); quest.setSeq( SeqFinish ); @@ -573,12 +573,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00030( World::Quest &quest, Entity::Player &player ) + void Scene00030( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 30, FADE_OUT | HIDE_UI | CONDITION_CUTSCENE, bindSceneReturn( &ClsArc997::Scene00030Return ) ); } - void Scene00030Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00030Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) player.finishQuest( getId(), result.getResult( 1 ) ); diff --git a/src/scripts/quest/classquest/ARC/ClsArc998.cpp b/src/scripts/quest/classquest/ARC/ClsArc998.cpp index 5336c45e..4d4536bf 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc998.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc998.cpp @@ -47,7 +47,7 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { @@ -72,12 +72,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, NONE, bindSceneReturn( &ClsArc998::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 )// accept quest { @@ -87,12 +87,12 @@ private: ////////////////////////////////////////////////////////////////////// - void Scene00001( World::Quest &quest, Entity::Player &player ) + void Scene00001( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 1, FADE_OUT | HIDE_UI | DISABLE_SKIP, bindSceneReturn( &ClsArc998::Scene00001Return ) ); } - void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) diff --git a/src/scripts/quest/classquest/ARC/ClsArc999.cpp b/src/scripts/quest/classquest/ARC/ClsArc999.cpp index 44a9a7e0..dad0f365 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc999.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc999.cpp @@ -36,7 +36,7 @@ public: ////////////////////////////////////////////////////////////////////// // Event Handlers - void onTalk( World::Quest &quest, Entity::Player &player, uint64_t actorId ) override + void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override { switch( actorId ) { @@ -54,12 +54,12 @@ private: // Available Scenes in this quest, not necessarly all are used ////////////////////////////////////////////////////////////////////// - void Scene00000( World::Quest &quest, Entity::Player &player ) + void Scene00000( World::Quest& quest, Entity::Player& player ) { eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ClsArc999::Scene00000Return ) ); } - void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result ) + void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { if( result.getResult( 0 ) == 1 ) {