diff --git a/deps/datReaderPs3/Dat.cpp b/deps/datReaderPs3/Dat.cpp index 1a7c150e..891c61dc 100644 --- a/deps/datReaderPs3/Dat.cpp +++ b/deps/datReaderPs3/Dat.cpp @@ -196,7 +196,7 @@ namespace xivps3::dat { outputFile->_type = FileType::standard; - uint32_t number_of_blocks = extract< uint32_t >( m_handle, "number_of_blocks", false ); + auto number_of_blocks = extract< uint32_t >( m_handle, "number_of_blocks", false ); // Just extract offset infos for the blocks to extract std::vector< DatStdFileBlockInfos > std_file_block_infos; @@ -219,7 +219,7 @@ namespace xivps3::dat { outputFile->_type = FileType::model; - DatMdlFileBlockInfos mdlBlockInfo = extract< DatMdlFileBlockInfos >( m_handle ); + auto mdlBlockInfo = extract< DatMdlFileBlockInfos >( m_handle ); // Getting the block number and read their sizes const uint32_t block_count = mdlBlockInfo.block_ids[ ::model_section_count - 1 ] + @@ -251,7 +251,7 @@ namespace xivps3::dat outputFile->_type = FileType::texture; // Extracts mipmap entries and the block sizes - uint32_t sectionCount = extract< uint32_t >( m_handle, "sections_count" ); + auto sectionCount = extract< uint32_t >( m_handle, "sections_count" ); std::vector< DatTexFileBlockInfos > texBlockInfo; extract< DatTexFileBlockInfos >( m_handle, sectionCount, texBlockInfo ); @@ -301,7 +301,7 @@ namespace xivps3::dat { m_handle.seekg( i_offset ); - DatBlockHeader block_header = extract< DatBlockHeader >( m_handle ); + auto block_header = extract< DatBlockHeader >( m_handle ); // Resizing the vector to write directly into it const uint32_t data_size = o_data.size(); diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 698fa34e..b899fb79 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -20,11 +20,11 @@ endif() #add_subdirectory( "exd_struct_gen" ) #add_subdirectory( "exd_struct_test" ) add_subdirectory( "quest_parser" ) -add_subdirectory( "discovery_parser" ) +#add_subdirectory( "discovery_parser" ) #add_subdirectory( "mob_parse" ) add_subdirectory( "pcb_reader" ) add_subdirectory( "nav_export" ) -add_subdirectory( "BattleNpcParserPs3" ) +#add_subdirectory( "BattleNpcParserPs3" ) #add_subdirectory( "event_object_parser" ) add_subdirectory( "action_parse" ) #add_subdirectory( "questbattle_bruteforce" ) \ No newline at end of file diff --git a/src/tools/action_parse/CMakeLists.txt b/src/tools/action_parse/CMakeLists.txt index 3b135e7e..0242f221 100644 --- a/src/tools/action_parse/CMakeLists.txt +++ b/src/tools/action_parse/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required( VERSION 3.0.2 ) cmake_policy(SET CMP0015 NEW) project(Tool_ActionParse) diff --git a/src/tools/quest_parser/CMakeLists.txt b/src/tools/quest_parser/CMakeLists.txt index dbd5edf3..3a92d3e0 100644 --- a/src/tools/quest_parser/CMakeLists.txt +++ b/src/tools/quest_parser/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required( VERSION 3.0.2 ) cmake_policy(SET CMP0015 NEW) project(Tool_QuestParser)