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

Fixed The Formatting Again

Browse source 
Please be the last time
This commit is contained in:
Biscuit Boy 2018-01-05 23:33:41 +11:00
parent 9b3026b4a6
commit 98e2415c65
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scripts/native/quest/subquest/gridania/SubFst002.cpp
View file

@ -26,6 +26,7 @@ private:
{ {
player.updateQuest( getId(), SEQ_1 ); player.updateQuest( getId(), SEQ_1 );
} }
<<<<<<< HEAD
}; };
player.eventPlay( getId (), 0, NONE, callback ); player.eventPlay( getId (), 0, NONE, callback );
@ -33,6 +34,15 @@ private:
void Scene00001(Entity::Player& player) void Scene00001(Entity::Player& player)
{ {
=======
};
player.eventPlay( getId (), 0, NONE, callback );
}
void Scene00001(Entity::Player& player)
{
>>>>>>> 8dc9faa... Fixed The Formatting Again
auto callback = [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) auto callback = [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )
{ {
if( param2 == 1 ) // finish quest if( param2 == 1 ) // finish quest
@ -40,6 +50,7 @@ private:
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ) )
player.finishQuest( getId() ); player.finishQuest( getId() );
} }
<<<<<<< HEAD
}; };
player.eventPlay( getId (), 1, NONE, callback ); player.eventPlay( getId (), 1, NONE, callback );
@ -58,6 +69,26 @@ public:
Scene00001( player ); Scene00001( player );
} }
=======
};
player.eventPlay( getId (), 1, NONE, callback );
}
public:
SubFst002() : EventScript( "SubFst002", 65561 ) {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >(actorId) );
if( actor == ACTOR0 && !player.hasQuest( getId() ) )
Scene00000( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH )
Scene00001( player );
}
>>>>>>> 8dc9faa... Fixed The Formatting Again
void onNpcKill( uint32_t npcId, Entity::Player& player ) override void onNpcKill( uint32_t npcId, Entity::Player& player ) override
{ {
if( npcId != ENEMY0 ) if( npcId != ENEMY0 )