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

exd parser optimizations

Browse source
This commit is contained in:
Taezen 2021-09-13 12:42:31 +02:00
parent 87ba83ce50
commit 7f983bbf67
10 changed files with 153 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

235
deps/datReader/Exd.cpp vendored
View file

@ -1,8 +1,6 @@
#include "Exd.h" #include "Exd.h"
#include "bparse.h" #include "bparse.h"
#include "stream.h"
#include <fstream>
#include "Exh.h" #include "Exh.h"
using xiv::utils::bparse::extract; using xiv::utils::bparse::extract;
@ -53,32 +51,24 @@ template<>
namespace xiv::exd namespace xiv::exd
{ {
Exd::Exd( std::shared_ptr< Exh > i_exh, const std::vector< std::shared_ptr< dat::File>>& i_files ) Exd::Exd( std::shared_ptr< Exh > exh, const std::vector< std::shared_ptr< dat::File > >& files )
{ {
_exh = i_exh; _exh = exh;
_files = i_files;
// Iterates over all the files // Iterates over all the files
const uint32_t member_count = _exh->get_members().size(); for( auto& file : files )
for( auto& file_ptr : _files )
{ {
// Get a stream std::vector< char > dataCpy = file->get_data_sections().front();
std::vector< char > dataCpy = file_ptr->get_data_sections().front();
std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
// Extract the header and skip to the record indices // Extract the header
auto exd_header = extract< ExdHeader >( iss ); auto exdHeader = extract< ExdHeader >( dataCpy, 0 );
iss.seekg( 0x20 );
// Preallocate and extract the record_indices const uint32_t recordCount = exdHeader.index_size / sizeof( ExdRecordIndex );
const uint32_t record_count = exd_header.index_size / sizeof( ExdRecordIndex ); for( uint32_t i = 0; i < recordCount; ++i )
std::vector< ExdRecordIndex > record_indices;
record_indices.reserve( record_count );
for( uint32_t i = 0; i < record_count; ++i )
{ {
auto recordIndex = extract< ExdRecordIndex >( iss ); auto recordIndex = extract< ExdRecordIndex >( dataCpy, 32 + ( i * sizeof( ExdRecordIndex ) ) );
_idCache[ recordIndex.id ] = ExdCacheEntry{ file_ptr, recordIndex.offset }; _idCache[ recordIndex.id ] = ExdCacheEntry{ file, recordIndex.offset + 6, extract< uint8_t >( dataCpy, recordIndex.offset + 5 ) };
} }
} }
} }
@ -91,40 +81,24 @@ namespace xiv::exd
{ {
auto cacheEntryIt = _idCache.find( id ); auto cacheEntryIt = _idCache.find( id );
if( cacheEntryIt == _idCache.end() ) if( cacheEntryIt == _idCache.end() || subRow >= cacheEntryIt->second.subRows )
throw std::runtime_error( "Id not found: " + std::to_string( id ) ); throw std::runtime_error( "Id + SubId combination not found: " + std::to_string( id ) + "." + std::to_string( subRow ) );
// Iterates over all the files auto dataCpy = cacheEntryIt->second.file->get_data_sections().front();
const uint32_t member_count = _exh->get_members().size();
auto& file_ptr = cacheEntryIt->second.file;
std::vector< char > dataCpy = file_ptr->get_data_sections().front(); std::vector< Field > fields;
std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) ); fields.reserve( _exh->get_members().size() );
// Get the vector fields for the given record and preallocate it uint32_t baseOffset = cacheEntryIt->second.offset + ( subRow * _exh->get_header().data_offset + 2 * ( subRow + 1 ) );
auto fields = _data[ id ];
fields.reserve( member_count );
iss.seekg( cacheEntryIt->second.offset + 6 );
uint8_t subRows = *reinterpret_cast< uint8_t* >( &dataCpy[ cacheEntryIt->second.offset + 5 ] ); for( auto& memberEntry : _exh->get_exh_members() )
if( subRow >= subRows )
throw std::runtime_error( "Out of bounds sub-row!" );
int offset = cacheEntryIt->second.offset + 6 + ( subRow * _exh->get_header().data_offset + 2 * ( subRow + 1 ) );
for( auto& member_entry : _exh->get_exh_members() )
{ {
// Seek to the position of the member to extract.
// 6 is because we have uint32_t/uint16_t at the start of each record
iss.seekg( offset + member_entry.offset );
// Switch depending on the type to extract // Switch depending on the type to extract
switch( member_entry.type ) switch( memberEntry.type )
{ {
case DataType::string: case DataType::string:
// Extract the offset to the actual string // Extract the offset to the actual string
// Seek to it then extract the actual string // Then extract the actual string from that offset
{ {
throw std::runtime_error( "String not implemented for variant 2!" ); throw std::runtime_error( "String not implemented for variant 2!" );
//auto string_offset = extract<uint32_t>( iss, "string_offset", false ); //auto string_offset = extract<uint32_t>( iss, "string_offset", false );
@ -134,50 +108,46 @@ namespace xiv::exd
break; break;
case DataType::boolean: case DataType::boolean:
fields.emplace_back( extract< bool >( iss, "bool" ) ); fields.emplace_back( extract< bool >( dataCpy, baseOffset + memberEntry.offset ) );
break; break;
case DataType::int8: case DataType::int8:
fields.emplace_back( extract< int8_t >( iss, "int8_t" ) ); fields.emplace_back( extract< int8_t >( dataCpy, baseOffset + memberEntry.offset ) );
break; break;
case DataType::uint8: case DataType::uint8:
fields.emplace_back( extract< uint8_t >( iss, "uint8_t" ) ); fields.emplace_back( extract< uint8_t >( dataCpy, baseOffset + memberEntry.offset ) );
break; break;
case DataType::int16: case DataType::int16:
fields.emplace_back( extract< int16_t >( iss, "int16_t", false ) ); fields.emplace_back( extract< int16_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::uint16: case DataType::uint16:
fields.emplace_back( extract< uint16_t >( iss, "uint16_t", false ) ); fields.emplace_back( extract< uint16_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::int32: case DataType::int32:
fields.emplace_back( extract< int32_t >( iss, "int32_t", false ) ); fields.emplace_back( extract< int32_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::uint32: case DataType::uint32:
fields.emplace_back( extract< uint32_t >( iss, "uint32_t", false ) ); fields.emplace_back( extract< uint32_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::float32: case DataType::float32:
fields.emplace_back( extract< float >( iss, "float", false ) ); fields.emplace_back( extract< float >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::uint64: case DataType::uint64:
fields.emplace_back( extract< uint64_t >( iss, "uint64_t", false ) ); fields.emplace_back( extract< uint64_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
default: default:
auto type = static_cast< uint16_t >( member_entry.type ); auto type = static_cast< uint16_t >( memberEntry.type );
if( type < 0x19 || type > 0x20 ) if( type < 0x19 || type > 0x20 )
throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) ); throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) );
uint64_t val = extract< uint64_t >( iss, "bool" ); fields.emplace_back( ( extract< uint8_t >( dataCpy, baseOffset + memberEntry.offset ) & ( 1 << ( type - 0x19 ) ) ) != 0 );
int32_t shift = type - 0x19;
int32_t i = 1 << shift;
val &= i;
fields.emplace_back( ( val & i ) == i );
break; break;
} }
} }
@ -193,84 +163,68 @@ namespace xiv::exd
if( cacheEntryIt == _idCache.end() ) if( cacheEntryIt == _idCache.end() )
throw std::runtime_error( "Id not found: " + std::to_string( id ) ); throw std::runtime_error( "Id not found: " + std::to_string( id ) );
// Iterates over all the files auto dataCpy = cacheEntryIt->second.file->get_data_sections().front();
const uint32_t member_count = _exh->get_members().size();
auto& file_ptr = cacheEntryIt->second.file;
std::vector< char > dataCpy = file_ptr->get_data_sections().front(); std::vector< Field > fields;
std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) ); fields.reserve( _exh->get_members().size() );
// Get the vector fields for the given record and preallocate it auto stringBaseOffset = cacheEntryIt->second.offset + _exh->get_header().data_offset;
auto fields = _data[ id ];
fields.reserve( member_count );
iss.seekg( cacheEntryIt->second.offset + 6 );
uint8_t subRows = *reinterpret_cast< uint8_t* >( &dataCpy[ cacheEntryIt->second.offset + 5 ] ); for( auto& memberEntry : _exh->get_exh_members() )
for( auto& member_entry : _exh->get_exh_members() )
{ {
// Seek to the position of the member to extract.
// 6 is because we have uint32_t/uint16_t at the start of each record
iss.seekg( cacheEntryIt->second.offset + 6 + member_entry.offset );
// Switch depending on the type to extract // Switch depending on the type to extract
switch( member_entry.type ) switch( memberEntry.type )
{ {
case DataType::string: case DataType::string:
// Extract the offset to the actual string // Extract the offset to the actual string
// Seek to it then extract the actual string // Then extract the actual string from that offset
{ {
auto string_offset = extract< uint32_t >( iss, "string_offset", false ); auto stringOffset = extract< uint32_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset, false );
iss.seekg( cacheEntryIt->second.offset + 6 + _exh->get_header().data_offset + string_offset ); fields.emplace_back( utils::bparse::extract_cstring( dataCpy, stringBaseOffset + stringOffset ) );
fields.emplace_back( utils::bparse::extract_cstring( iss, "string" ) );
} }
break; break;
case DataType::boolean: case DataType::boolean:
fields.emplace_back( extract< bool >( iss, "bool" ) ); fields.emplace_back( extract< bool >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset ) );
break; break;
case DataType::int8: case DataType::int8:
fields.emplace_back( extract< int8_t >( iss, "int8_t" ) ); fields.emplace_back( extract< int8_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset ) );
break; break;
case DataType::uint8: case DataType::uint8:
fields.emplace_back( extract< uint8_t >( iss, "uint8_t" ) ); fields.emplace_back( extract< uint8_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset ) );
break; break;
case DataType::int16: case DataType::int16:
fields.emplace_back( extract< int16_t >( iss, "int16_t", false ) ); fields.emplace_back( extract< int16_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset, false ) );
break; break;
case DataType::uint16: case DataType::uint16:
fields.emplace_back( extract< uint16_t >( iss, "uint16_t", false ) ); fields.emplace_back( extract< uint16_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset, false ) );
break; break;
case DataType::int32: case DataType::int32:
fields.emplace_back( extract< int32_t >( iss, "int32_t", false ) ); fields.emplace_back( extract< int32_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset, false ) );
break; break;
case DataType::uint32: case DataType::uint32:
fields.emplace_back( extract< uint32_t >( iss, "uint32_t", false ) ); fields.emplace_back( extract< uint32_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset, false ) );
break; break;
case DataType::float32: case DataType::float32:
fields.emplace_back( extract< float >( iss, "float", false ) ); fields.emplace_back( extract< float >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset, false ) );
break; break;
case DataType::uint64: case DataType::uint64:
fields.emplace_back( extract< uint64_t >( iss, "uint64_t", false ) ); fields.emplace_back( extract< uint64_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset, false ) );
break; break;
default: default:
auto type = static_cast< uint16_t >( member_entry.type ); auto type = static_cast< uint16_t >( memberEntry.type );
if( type < 0x19 || type > 0x20 ) if( type < 0x19 || type > 0x20 )
throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) ); throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) );
uint64_t val = extract< uint64_t >( iss, "bool" ); fields.emplace_back( ( extract< uint8_t >( dataCpy, cacheEntryIt->second.offset + memberEntry.offset ) & ( 1 << ( type - 0x19 ) ) ) != 0 );
int32_t shift = type - 0x19;
int32_t i = 1 << shift;
val &= i;
fields.emplace_back( ( val & i ) == i );
break; break;
} }
} }
@ -279,106 +233,99 @@ namespace xiv::exd
} }
// Get all rows // Get all rows
const std::map< uint32_t, std::vector< Field>>& Exd::get_rows() const std::map< ExdRow, std::vector< Field >, exdRowSort > Exd::get_rows()
{ {
// Iterates over all the files std::map< ExdRow, std::vector< Field >, exdRowSort > data;
const uint32_t member_count = _exh->get_members().size();
for( auto& file_ptr : _files ) // Iterates over all the cached ids
const uint32_t memberCount = _exh->get_members().size();
for( auto& cacheEntry : _idCache )
{ {
// Get a stream std::vector< char > dataCpy = cacheEntry.second.file->get_data_sections().front();
std::vector< char > dataCpy = file_ptr->get_data_sections().front();
std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
// Extract the header and skip to the record indices auto baseOffset = cacheEntry.second.offset;
auto exd_header = extract< ExdHeader >( iss ); auto stringBaseOffset = baseOffset + _exh->get_header().data_offset;
iss.seekg( 0x20 );
// Preallocate and extract the record_indices for( int32_t i = 0; i < cacheEntry.second.subRows; i++ )
const uint32_t record_count = exd_header.index_size / sizeof( ExdRecordIndex );
std::vector< ExdRecordIndex > record_indices;
record_indices.reserve( record_count );
for( uint32_t i = 0; i < record_count; ++i )
{
record_indices.emplace_back( extract< ExdRecordIndex >( iss ) );
}
for( auto& record_index : record_indices )
{ {
// Get the vector fields for the given record and preallocate it // Get the vector fields for the given record and preallocate it
auto& fields = _data[ record_index.id ]; ExdRow row = { cacheEntry.first, i };
fields.reserve( member_count ); auto& fields = data[ row ];
fields.reserve( memberCount );
for( auto& member_entry : _exh->get_exh_members() ) if( _exh->get_header().variant == 2 )
baseOffset = cacheEntry.second.offset + ( i * _exh->get_header().data_offset + 2 * ( i + 1 ) );
for( auto& memberEntry : _exh->get_exh_members() )
//for( auto& member_entry : _exh->get_members() ) //for( auto& member_entry : _exh->get_members() )
{ {
// Seek to the position of the member to extract.
// 6 is because we have uint32_t/uint16_t at the start of each record
iss.seekg( record_index.offset + 6 + member_entry.offset );
// Switch depending on the type to extract // Switch depending on the type to extract
switch( member_entry.type ) switch( memberEntry.type )
{ {
case DataType::string: case DataType::string:
// Extract the offset to the actual string // Extract the offset to the actual string
// Seek to it then extract the actual string // Then extract the actual string from that offset
{ {
auto string_offset = extract< uint32_t >( iss, "string_offset", false ); if( _exh->get_header().variant == 1 )
iss.seekg( record_index.offset + 6 + _exh->get_header().data_offset + string_offset ); {
fields.emplace_back( utils::bparse::extract_cstring( iss, "string" ) ); auto stringOffset = extract< uint32_t >( dataCpy, baseOffset + memberEntry.offset, false );
fields.emplace_back( utils::bparse::extract_cstring( dataCpy, stringBaseOffset + stringOffset ) );
}
else if( _exh->get_header().variant == 2 )
{
throw std::runtime_error( "String not implemented for variant 2!" );
}
} }
break; break;
case DataType::boolean: case DataType::boolean:
fields.emplace_back( extract< bool >( iss, "bool" ) ); fields.emplace_back( extract< bool >( dataCpy, baseOffset + memberEntry.offset ) );
break; break;
case DataType::int8: case DataType::int8:
fields.emplace_back( extract< int8_t >( iss, "int8_t" ) ); fields.emplace_back( extract< int8_t >( dataCpy, baseOffset + memberEntry.offset ) );
break; break;
case DataType::uint8: case DataType::uint8:
fields.emplace_back( extract< uint8_t >( iss, "uint8_t" ) ); fields.emplace_back( extract< uint8_t >( dataCpy, baseOffset + memberEntry.offset ) );
break; break;
case DataType::int16: case DataType::int16:
fields.emplace_back( extract< int16_t >( iss, "int16_t", false ) ); fields.emplace_back( extract< int16_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::uint16: case DataType::uint16:
fields.emplace_back( extract< uint16_t >( iss, "uint16_t", false ) ); fields.emplace_back( extract< uint16_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::int32: case DataType::int32:
fields.emplace_back( extract< int32_t >( iss, "int32_t", false ) ); fields.emplace_back( extract< int32_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::uint32: case DataType::uint32:
fields.emplace_back( extract< uint32_t >( iss, "uint32_t", false ) ); fields.emplace_back( extract< uint32_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::float32: case DataType::float32:
fields.emplace_back( extract< float >( iss, "float", false ) ); fields.emplace_back( extract< float >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
case DataType::uint64: case DataType::uint64:
fields.emplace_back( extract< uint64_t >( iss, "uint64_t", false ) ); fields.emplace_back( extract< uint64_t >( dataCpy, baseOffset + memberEntry.offset, false ) );
break; break;
default: default:
auto type = static_cast< uint16_t >( member_entry.type ); auto type = static_cast< uint16_t >( memberEntry.type );
if( type < 0x19 || type > 0x20 ) if( type < 0x19 || type > 0x20 )
throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) ); throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) );
uint64_t val = extract< uint64_t >( iss, "bool" ); fields.emplace_back( ( extract< uint8_t >( dataCpy, baseOffset + memberEntry.offset ) & ( 1 << ( type - 0x19 ) ) ) != 0 );
int32_t shift = type - 0x19;
int32_t i = 1 << shift;
val &= i;
fields.emplace_back( ( val & i ) == i );
break; break;
} }
} }
} }
} }
return _data; return data;
} }
} }

31
deps/datReader/Exd.h vendored
View file

@ -3,6 +3,8 @@
#include <memory> #include <memory>
#include <map> #include <map>
#include <unordered_map>
#include <set>
#include <variant> #include <variant>
@ -30,19 +32,37 @@ namespace xiv::exd
{ {
std::shared_ptr< dat::File > file; std::shared_ptr< dat::File > file;
uint32_t offset; uint32_t offset;
uint8_t subRows;
};
struct ExdRow
{
uint32_t rowId;
uint8_t subRowId;
};
struct exdRowSort
{
constexpr bool operator()( const ExdRow& _Left, const ExdRow& _Right ) const
{
if( _Left.rowId == _Right.rowId )
return _Left.subRowId < _Right.subRowId;
return _Left.rowId < _Right.rowId;
}
}; };
// Data for a given language // Data for a given language
class Exd class Exd
{ {
public: public:
// i_exh: the header // exh: the header
// i_files: the multiple exd files // files: the multiple exd files
Exd() Exd()
{ {
} }
Exd( std::shared_ptr< Exh > i_exh, const std::vector< std::shared_ptr< dat::File>>& i_files ); Exd( std::shared_ptr< Exh > exh, const std::vector< std::shared_ptr< dat::File > >& files );
~Exd(); ~Exd();
@ -53,12 +73,9 @@ namespace xiv::exd
const std::vector< Field > get_row( uint32_t id, uint32_t subRow ); const std::vector< Field > get_row( uint32_t id, uint32_t subRow );
// Get all rows // Get all rows
const std::map< uint32_t, std::vector< Field>>& get_rows(); const std::map< ExdRow, std::vector< Field >, exdRowSort > get_rows();
protected: protected:
// Data indexed by the ID of the row, the vector is field with the same order as exh.members
std::map< uint32_t, std::vector< Field>> _data;
std::vector< std::shared_ptr< dat::File>> _files;
std::shared_ptr< Exh > _exh; std::shared_ptr< Exh > _exh;
std::map< uint32_t, ExdCacheEntry > _idCache; std::map< uint32_t, ExdCacheEntry > _idCache;
}; };

7
deps/datReader/bparse.cpp vendored
View file

@ -5,4 +5,9 @@ std::string xiv::utils::bparse::extract_cstring( std::istream& i_stream, const s
std::string temp_str; std::string temp_str;
std::getline( i_stream, temp_str, '\0' ); std::getline( i_stream, temp_str, '\0' );
return temp_str; return temp_str;
} }
std::string xiv::utils::bparse::extract_cstring( std::vector< char >& data, uint32_t pos )
{
return &data[ pos ];
}

18
deps/datReader/bparse.h vendored
View file

@ -93,9 +93,27 @@ namespace xiv::utils::bparse
} }
} }
template< typename StructType >
StructType extract( std::vector< char >& data, uint32_t pos, bool isLe = true )
{
StructType tempStruct = *reinterpret_cast< StructType* >( &data[ pos ] );
if( std::is_class< StructType >::value )
{
reorder( tempStruct );
}
else if( !isLe )
{
tempStruct = byteswap( tempStruct );
}
return tempStruct;
}
// For cstrings // For cstrings
std::string extract_cstring( std::istream& i_stream, const std::string& i_name ); std::string extract_cstring( std::istream& i_stream, const std::string& i_name );
std::string extract_cstring( std::vector< char >& data, uint32_t pos );
} }
#endif // XIV_UTILS_BPARSE_H #endif // XIV_UTILS_BPARSE_H

2
src/common/Exd/ExdDataGenerated.cpp
View file

@ -13050,7 +13050,7 @@ void Sapphire::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set
for( auto row : pDataRows ) for( auto row : pDataRows )
{ {
uint32_t id = row.first; uint32_t id = row.first.rowId;
outIdList.insert( id ); outIdList.insert( id );
} }
} }

6
src/tools/discovery_parser/main.cpp
View file

@ -162,12 +162,12 @@ std::string zoneNameToPath( const std::string& name )
auto teriPath = std::get< std::string >( auto teriPath = std::get< std::string >(
fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Path ) ) ); fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Path ) ) );
ZoneInfo info; ZoneInfo info;
info.id = row.first; info.id = row.first.rowId;
info.path = teriPath; info.path = teriPath;
info.name = teriName; info.name = teriName;
info.mapId = std::get< uint16_t >( info.mapId = std::get< uint16_t >(
fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Map ) ) ); fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Map ) ) );
zoneInfoMap[ row.first ] = info; zoneInfoMap[ row.first.rowId ] = info;
if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) ) if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) )
{ {
@ -212,7 +212,7 @@ void loadEobjNames()
static auto exd = static_cast< xiv::exd::Exd >( cat.get_data_ln( xiv::exd::Language::en ) ); static auto exd = static_cast< xiv::exd::Exd >( cat.get_data_ln( xiv::exd::Language::en ) );
for( auto& row : exd.get_rows() ) for( auto& row : exd.get_rows() )
{ {
auto id = row.first; auto id = row.first.rowId;
auto& fields = row.second; auto& fields = row.second;
auto name = std::get< std::string >( fields.at( 0 ) ); auto name = std::get< std::string >( fields.at( 0 ) );
eobjNameMap[ id ] = name; eobjNameMap[ id ] = name;

2
src/tools/exd_common_gen/main.cpp
View file

@ -42,7 +42,7 @@ std::string generateEnum( const std::string& exd, int8_t nameIndex, const std::s
for( auto row : rows ) for( auto row : rows )
{ {
auto& fields = row.second; auto& fields = row.second;
uint32_t id = row.first; uint32_t id = row.first.rowId;
std::string value; std::string value;
try try

2
src/tools/exd_struct_gen/ExdData.cpp.tmpl
View file

@ -23,7 +23,7 @@ void Sapphire::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set
for( auto row : pDataRows ) for( auto row : pDataRows )
{ {
uint32_t id = row.first; uint32_t id = row.first.rowId;
outIdList.insert( id ); outIdList.insert( id );
} }
} }

8
src/tools/nav_export/main.cpp
View file

@ -89,7 +89,7 @@ std::string getEobjSgbPath( uint32_t eobjId )
for( auto& row : exportedSgExd.get_rows() ) for( auto& row : exportedSgExd.get_rows() )
{ {
auto id = row.first; auto id = row.first.rowId;
auto& fields = row.second; auto& fields = row.second;
auto path = std::get< std::string >( fields.at( 0 ) ); auto path = std::get< std::string >( fields.at( 0 ) );
@ -100,7 +100,7 @@ std::string getEobjSgbPath( uint32_t eobjId )
for( auto& row : eObjExd.get_rows() ) for( auto& row : eObjExd.get_rows() )
{ {
auto id = row.first; auto id = row.first.rowId;
auto& fields = row.second; auto& fields = row.second;
eobjSgbPaths[id] = std::get< uint16_t >( fields.at( 11 ) ); eobjSgbPaths[id] = std::get< uint16_t >( fields.at( 11 ) );
@ -127,9 +127,9 @@ std::string zoneNameToPath( const std::string& name )
{ {
path = teriPath; path = teriPath;
found = true; found = true;
zoneId = row.first; zoneId = row.first.rowId;
} }
zoneNameMap[ row.first ] = teriName; zoneNameMap[ row.first.rowId ] = teriName;
} }
if( found ) if( found )

8
src/tools/pcb_reader/main.cpp
View file

@ -91,7 +91,7 @@ std::string getEobjSgbPath( uint32_t eobjId )
for( auto& row : exportedSgExd.get_rows() ) for( auto& row : exportedSgExd.get_rows() )
{ {
auto id = row.first; auto id = row.first.rowId;
auto& fields = row.second; auto& fields = row.second;
auto path = std::get< std::string >( fields.at( 0 ) ); auto path = std::get< std::string >( fields.at( 0 ) );
@ -102,7 +102,7 @@ std::string getEobjSgbPath( uint32_t eobjId )
for( auto& row : eObjExd.get_rows() ) for( auto& row : eObjExd.get_rows() )
{ {
auto id = row.first; auto id = row.first.rowId;
auto& fields = row.second; auto& fields = row.second;
eobjSgbPaths[id] = std::get< uint16_t >( fields.at( 11 ) ); eobjSgbPaths[id] = std::get< uint16_t >( fields.at( 11 ) );
@ -129,9 +129,9 @@ std::string zoneNameToPath( const std::string& name )
{ {
path = teriPath; path = teriPath;
found = true; found = true;
zoneId = row.first; zoneId = row.first.rowId;
} }
zoneNameMap[ row.first ] = teriName; zoneNameMap[ row.first.rowId ] = teriName;
} }
if( found ) if( found )