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

Brief event cleanup

Browse source
This commit is contained in:
Mordred 2018-11-20 23:24:37 +01:00
parent 54f3936542
commit b6590fbe14
1 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/servers/sapphire_zone/Actor/PlayerEvent.cpp
View file

@ -158,23 +158,18 @@ void Core::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
Core::Event::EventHandlerPtr Core::Entity::Player::bootstrapSceneEvent( uint32_t eventId, uint32_t flags ) Core::Event::EventHandlerPtr Core::Entity::Player::bootstrapSceneEvent( uint32_t eventId, uint32_t flags )
{ {
if( flags & 0x02 )
setStateFlag( PlayerStateFlag::WatchingCutscene );
auto pEvent = getEvent( eventId ); auto pEvent = getEvent( eventId );
if( !pEvent && getEventCount() ) if( !pEvent )
{
// We're trying to play a nested event, need to start it first.
//eventStart( getId(), eventId, Event::EventHandler::Nest, 0, 0 );
//pEvent = getEvent( eventId );
}
else if( !pEvent )
{ {
auto pLog = g_fw.get< Logger >(); auto pLog = g_fw.get< Logger >();
pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" ); pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
return nullptr; return nullptr;
} }
if( flags & 0x02 )
setStateFlag( PlayerStateFlag::WatchingCutscene );
return pEvent; return pEvent;
} }
@ -266,21 +261,6 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer )
if( callback ) if( callback )
callback( *this, pEvent->getActorId() ); callback( *this, pEvent->getActorId() );
auto events = eventList();
/*for( auto it : events )
{
if( it.second->hasPlayedScene() == false )
{
// TODO: not happy with this, this is also prone to break wit more than one remaining event in there
queuePacket( std::make_shared< EventFinishPacket >( getId(), it.second->getId(),
it.second->getEventType(),
it.second->getEventParam() ) );
removeEvent( it.second->getId() );
}
}*/
break; break;
} }
default: default: