From 138dd3d536ff1c9661843e0c81ac2e6c029a06c1 Mon Sep 17 00:00:00 2001 From: Dantestyle Date: Mon, 21 May 2018 23:21:15 +0200 Subject: [PATCH] More style, more typo, more fix --- .../quest/subquest/gridania/SubFst003.cpp | 73 +++++++++---------- .../quest/subquest/gridania/SubFst004.cpp | 4 +- .../quest/subquest/gridania/SubFst019.cpp | 4 +- 3 files changed, 38 insertions(+), 43 deletions(-) diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp index bad0f8b4..231ed921 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp @@ -37,82 +37,77 @@ class SubFst003 : public EventScript static constexpr auto Seq1Actor1Npctradeok = 100; public: - SubFst003( ) : EventScript( 65562 ) - { }; - ~SubFst003( ) - { }; + SubFst003() : EventScript( 65562 ) + {}; + ~SubFst003() + {}; - void onTalk(uint32_t eventId, Entity::Player& player, uint64_t actorId) override + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor(actorId); + auto actor = Event::mapEventActorToRealActor( actorId ); - if (actor == SubFst003::Actor0) + if( actor == SubFst003::Actor0 ) { - Scene00000(player); + Scene00000( player ); } - else if (actor == SubFst003::Actor1 && player.getQuestUI8AL(m_id) == 1) + else if(actor == SubFst003::Actor1 ) { - Scene00001(player); + Scene00001( player ); } } private: - void Scene00000(Entity::Player& player) + void Scene00000( Entity::Player& player ) { - player.playScene(m_id, 0, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + player.playScene( getId(), 0, HIDE_HOTBAR, + [&]( Entity::Player& player, const Event::SceneResult& result ) { - if (result.param2 == 1) // accept quest + if( result.param2 == 1 ) // accept quest { - player.updateQuest(m_id, 255); - player.setQuestUI8AL(m_id, 1); + player.updateQuest( getId(), 255 ); + player.setQuestUI8BH( getId(), 1 ); } - }); + } ); } - void Scene00001(Entity::Player& player) + void Scene00001( Entity::Player& player ) { - player.playScene(m_id, 1, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + player.playScene( getId(), 1, HIDE_HOTBAR, + [&]( Entity::Player& player, const Event::SceneResult& result ) { - if (result.param2 == 1) + if( result.param2 == 1 ) { - Scene00100(player); + Scene00100( player ); } else { - Scene00099(player); + Scene00099( player ); } - }); + } ); } void Scene00099( Entity::Player& player ) { - player.playScene(m_id, 99, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + player.playScene( getId(), 99, HIDE_HOTBAR, + [&]( Entity::Player& player, const Event::SceneResult& result ) { - player.playScene(m_id, 99, 0, 0, 0); - }); + player.playScene( getId(), 99, 0, 0, 0 ); + } ); } void Scene00100( Entity::Player& player ) { - player.playScene(m_id, 100, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + player.playScene( getId(), 100, HIDE_HOTBAR, + [&]( Entity::Player& player, const Event::SceneResult& result ) { - player.sendQuestMessage(m_id, 1, 0, 0, 0); - player.setQuestUI8BH(m_id, 1); - player.setQuestUI8AL(m_id, 0); + player.setQuestUI8BH( getId(), 0); - if (player.getQuestUI8BH(m_id) == 1) + if( player.giveQuestRewards( getId(), 0 ) ) { - if (player.giveQuestRewards(m_id, 0)) - { - player.finishQuest(m_id); - } + player.finishQuest( getId() ); } - }); + } ); } }; diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp index ddf15cab..a7f58e6e 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp @@ -42,9 +42,9 @@ class SubFst004 : public EventScript public: SubFst004() : EventScript( 65563 ) - { }; + {}; ~SubFst004() - { }; + {}; void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp index 2ff41727..d2411c3b 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp @@ -35,9 +35,9 @@ class SubFst019 : public EventScript public: SubFst019() : EventScript( 65585 ) - { }; + {}; ~SubFst019() - { }; + {}; void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override {