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

oops, that was not the right scene

Browse source
This commit is contained in:
collett 2021-08-16 02:20:43 +09:00
parent f1210d6deb
commit 800bf5618f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/scripts/instances/wedding/SanctumOfTheTwelve.cpp
View file

@ -379,7 +379,7 @@ public:
( v4 == 6 ? 1020 : ( v4 == 6 ? 1020 :
( v4 == 7 ? 1021 : ( v4 == 7 ? 1021 :
( v4 == 8 ? 1125 : ( v4 == 8 ? 1125 :
( v4 == 9 ? 1126 : 1127 ) ) ) ) ) ) ) ) ); ( v4 == 9 ? 1126 : 1127 ) ) ) ) ) ) ) ) ); //FIX THIS SHIT BEFORE PR
packetData.popupTimeMs = 6000; packetData.popupTimeMs = 6000;
packetData.param[ 0 ] = 1024; packetData.param[ 0 ] = 1024;
packetData.param[ 1 ] = instance.getCustomVar( 1 ); packetData.param[ 1 ] = instance.getCustomVar( 1 );
@ -397,12 +397,11 @@ public:
{ {
if( dt >= 78 ) if( dt >= 78 )
{ {
auto qBH = instance.getCustomVar( 102 ); instance.foreachPlayer( [ &instance ]( auto p )
instance.foreachPlayer( [ &instance, qBH ]( auto p )
{ {
p->eventStart( p->getId(), instance.getDirectorId(), Event::EventHandler::GameProgress, 1, 1 ); p->eventStart( p->getId(), instance.getDirectorId(), Event::EventHandler::GameProgress, 1, 1 );
std::vector< uint32_t > paramList; std::vector< uint32_t > paramList;
paramList.push_back( 665 + qBH ); paramList.push_back( 50002 );
auto seq5Callback = [ & ]( Entity::Player& player, const Event::SceneResult& result ) auto seq5Callback = [ & ]( Entity::Player& player, const Event::SceneResult& result )
{ {