From 24e63e52a5c0b435f4d47a7f05942013ff8a8472 Mon Sep 17 00:00:00 2001 From: Dantestyle Date: Mon, 21 May 2018 22:39:51 +0200 Subject: [PATCH] SubFst004 typo (cause I want Adam happy :D) and SubFst019 typo and style --- .../quest/subquest/gridania/SubFst004.cpp | 10 +++++----- .../quest/subquest/gridania/SubFst019.cpp | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp index c29c69e8..ddf15cab 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp @@ -68,7 +68,7 @@ class SubFst004 : public EventScript void Scene00000( Entity::Player& player ) { - player.playScene( getId(), 0, 8192, + player.playScene( getId(), 0, HIDE_HOTBAR, [&]( Entity::Player& player, const Event::SceneResult& result ) { if( result.param2 == 1 ) // accept quest @@ -78,7 +78,7 @@ class SubFst004 : public EventScript void Scene00001( Entity::Player& player ) { - player.playScene( getId(), 1, 8192, + player.playScene( getId(), 1, HIDE_HOTBAR, [&]( Entity::Player& player, const Event::SceneResult& result ) { player.sendQuestMessage( getId(), 0, 1, 21002, 0 ); @@ -89,7 +89,7 @@ class SubFst004 : public EventScript void Scene00002( Entity::Player& player ) { - player.playScene( getId(), 2, 8192, + player.playScene( getId(), 2, HIDE_HOTBAR, [&]( Entity::Player& player, const Event::SceneResult& result ) { if( result.param2 == 1 ) @@ -105,7 +105,7 @@ class SubFst004 : public EventScript void Scene00099( Entity::Player& player ) { - player.playScene( getId(), 99, 8192, + player.playScene( getId(), 99, HIDE_HOTBAR, [&]( Entity::Player& player, const Event::SceneResult& result ) { player.playScene( getId(), 99, 0, 0, 0 ); @@ -114,7 +114,7 @@ class SubFst004 : public EventScript void Scene00100( Entity::Player& player ) { - player.playScene( getId(), 100, 8192, + player.playScene( getId(), 100, HIDE_HOTBAR, [&]( Entity::Player& player, const Event::SceneResult& result ) { player.setQuestUI8AL( getId(), 0 ); diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp index da531702..2ff41727 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp @@ -43,11 +43,11 @@ class SubFst019 : public EventScript { auto actor = Event::mapEventActorToRealActor( actorId ); - if ( actor == SubFst019::Actor0 ) + if( actor == SubFst019::Actor0 ) { Scene00000( player ); } - else if ( actor == SubFst019::Actor1 ) + else if( actor == SubFst019::Actor1 ) { Scene00001( player ); } @@ -57,25 +57,25 @@ class SubFst019 : public EventScript void Scene00000( Entity::Player& player ) { - player.playScene( m_id, 0, 8192, + player.playScene( getId(), 0, HIDE_HOTBAR, [&]( Entity::Player& player, const Event::SceneResult& result ) { - if ( result.param2 == 1 ) + if( result.param2 == 1 ) { - player.updateQuest( m_id, 255 ); + player.updateQuest( getId(), 255 ); } } ); } void Scene00001( Entity::Player& player ) { - player.playScene( m_id, 1, 8192, + player.playScene( getId(), 1, HIDE_HOTBAR, [&]( Entity::Player& player, const Event::SceneResult& result ) { - if ( result.param2 == 1 ) + if( result.param2 == 1 ) { - if ( player.giveQuestRewards( m_id, 0 ) ) - player.finishQuest( m_id ); + if( player.giveQuestRewards( getId(), 0 ) ) + player.finishQuest( getId() ); } } ); }