mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity

Style, cleanup

Browse source
This commit is contained in:
goaaats 2018-01-08 23:38:27 +01:00
parent f6ed8125b0
commit 9f145c28c2
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/servers/sapphire_zone/Session.cpp
View file

@ -111,9 +111,9 @@ void Core::Session::updateLastSqlTime()
m_lastSqlTime = static_cast< uint32_t >( Util::getTimeSeconds() ); m_lastSqlTime = static_cast< uint32_t >( Util::getTimeSeconds() );
} }
void Core::Session::startReplay( const std::string& folderpath ) void Core::Session::startReplay( const std::string& path )
{ {
if( !boost::filesystem::exists( folderpath ) ) if( !boost::filesystem::exists( path ) )
{ {
getPlayer()->sendDebug( "Couldn't find folder." ); getPlayer()->sendDebug( "Couldn't find folder." );
return; return;
@ -123,19 +123,21 @@ void Core::Session::startReplay( const std::string& folderpath )
std::vector< std::tuple< uint64_t, std::string > > loadedSets; std::vector< std::tuple< uint64_t, std::string > > loadedSets;
for( auto it = boost::filesystem::directory_iterator( boost::filesystem::path( folderpath ) ); it != boost::filesystem::directory_iterator(); ++it ) for( auto it = boost::filesystem::directory_iterator( boost::filesystem::path( path ) );
it != boost::filesystem::directory_iterator(); ++it )
{ {
// Get the filename of the current element // Get the filename of the current element
auto fileName = it->path().filename().string(); auto fileName = it->path().filename().string();
auto unixTime = atoi( fileName.substr( 0, 10 ).c_str() ); auto unixTime = atoi( fileName.substr( 0, 10 ).c_str() );
if( unixTime > 1000000000) if( unixTime > 1000000000 )
{ {
loadedSets.push_back( std::tuple< uint64_t, std::string >( unixTime, it->path().string() ) ); loadedSets.push_back( std::tuple< uint64_t, std::string >( unixTime, it->path().string() ) );
} }
} }
sort( loadedSets.begin(), loadedSets.end(), []( const std::tuple< uint64_t, std::string >& left, const std::tuple< uint64_t, std::string >& right) sort( loadedSets.begin(), loadedSets.end(),
[]( const std::tuple< uint64_t, std::string >& left, const std::tuple< uint64_t, std::string >& right)
{ {
return std::get< 0 >( left ) < std::get< 0 >( right ); return std::get< 0 >( left ) < std::get< 0 >( right );
} ); } );
@ -144,7 +146,9 @@ void Core::Session::startReplay( const std::string& folderpath )
for( auto set : loadedSets ) for( auto set : loadedSets )
{ {
m_replayCache.push_back( std::tuple<uint64_t, std::string>( Util::getTimeSeconds() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) ); m_replayCache.push_back( std::tuple< uint64_t, std::string >(
Util::getTimeSeconds() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
g_log.info( "Registering " + std::get< 1 >( set ) + " for " + std::to_string( std::get< 0 >( set ) - startTime ) ); g_log.info( "Registering " + std::get< 1 >( set ) + " for " + std::to_string( std::get< 0 >( set ) - startTime ) );
} }
@ -158,21 +162,24 @@ void Core::Session::stopReplay()
m_replayCache.clear(); m_replayCache.clear();
} }
void Core::Session::processReplay()
{
int at = 0;
for( const auto& set : m_replayCache )
{
if( std::get< 0 >( set ) == Util::getTimeSeconds() )
{
m_pZoneConnection->injectPacket( std::get< 1 >( set ), *getPlayer().get() );
m_replayCache.erase( m_replayCache.begin() + at );
}
at++;
}
}
void Core::Session::update() void Core::Session::update()
{ {
if( m_isReplaying ) if( m_isReplaying )
{ processReplay();
int at = 0;
for( const auto& set : m_replayCache )
{
if( std::get< 0 >( set ) == Util::getTimeSeconds() )
{
m_pZoneConnection->injectPacket( std::get< 1 >( set ), *getPlayer().get() );
m_replayCache.erase( m_replayCache.begin() + at );
}
at++;
}
}
if( m_pZoneConnection ) if( m_pZoneConnection )
{ {

1
src/servers/sapphire_zone/Session.h
View file

@ -28,6 +28,7 @@ namespace Core {
void startReplay( const std::string& folderpath ); void startReplay( const std::string& folderpath );
void stopReplay(); void stopReplay();
void processReplay();
void close(); void close();