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

fix InstanceObjectCache crashing if expansion is not installed

Browse source
This commit is contained in:
NotAdam 2020-01-05 20:36:52 +11:00
parent 8fa3a7d3f4
commit 45ba202ac2
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/world/Territory/InstanceObjectCache.cpp
View file

@ -12,6 +12,8 @@
#include <ExdCat.h> #include <ExdCat.h>
#include <Exd.h> #include <Exd.h>
#include <Logging/Logger.h>
Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework > pFramework ) : Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework > pFramework ) :
m_pFramework( pFramework ) m_pFramework( pFramework )
{ {
@ -35,10 +37,6 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
if( path.empty() ) if( path.empty() )
continue; continue;
// TODO: Horrible workaround... Fails if expansion is not installed
if( path.find( "ex3" ) != std::string::npos )
continue;
path = std::string( "bg/" ) + path.substr( 0, path.find( "/level/" ) ); path = std::string( "bg/" ) + path.substr( 0, path.find( "/level/" ) );
// TODO: it does feel like this needs to be streamlined into the datReader instead of being done here... // TODO: it does feel like this needs to be streamlined into the datReader instead of being done here...
@ -47,10 +45,21 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
std::vector< char > bgSection; std::vector< char > bgSection;
std::vector< char > planmapSection; std::vector< char > planmapSection;
auto test_file = pExd->getGameData()->getFile( bgLgbPath ); std::unique_ptr< xiv::dat::File > bgFile;
bgSection = test_file->access_data_sections().at( 0 ); std::unique_ptr< xiv::dat::File > planmap_file;
auto planmap_file = pExd->getGameData()->getFile( planmapLgbPath ); try
{
bgFile = pExd->getGameData()->getFile( bgLgbPath );
planmap_file = pExd->getGameData()->getFile( planmapLgbPath );
}
catch( std::runtime_error& )
{
// ignore files that aren't found
continue;
}
bgSection = bgFile->access_data_sections().at( 0 );
planmapSection = planmap_file->access_data_sections().at( 0 ); planmapSection = planmap_file->access_data_sections().at( 0 );
std::vector< std::string > stringList; std::vector< std::string > stringList;
@ -89,6 +98,11 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
} }
} }
std::cout << "\n"; std::cout << "\n";
Logger::debug(
"InstanceObjectCache Cached: MapRange: {} ExitRange: {} PopRange: {}",
m_mapRangeCache.size(), m_exitRangeCache.size(), m_popRangeCache.size()
);
} }

5
src/world/Territory/InstanceObjectCache.h
View file

@ -53,6 +53,11 @@ namespace Sapphire
it->second[ entry.header.instanceId ] = pShared; it->second[ entry.header.instanceId ] = pShared;
} }
} }
uint32_t size() const
{
return m_objectCache.size();
}
}; };
class InstanceObjectCache class InstanceObjectCache