From af0ac23e460d37c3d928952743a5ebcdd6a48e03 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sat, 27 Oct 2018 22:47:58 +1100 Subject: [PATCH] quest_parser unboosted --- CMakeLists.txt | 2 +- src/tools/quest_parser/CMakeLists.txt | 4 +--- src/tools/quest_parser/main.cpp | 18 +++++++++++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5accedd0..202363f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ add_subdirectory( "src/servers" ) #add_subdirectory( "src/tools/exd_common_gen" ) add_subdirectory( "src/tools/exd_struct_gen" ) add_subdirectory( "src/tools/exd_struct_test" ) -#add_subdirectory( "src/tools/quest_parser" ) +add_subdirectory( "src/tools/quest_parser" ) #add_subdirectory( "src/tools/discovery_parser" ) #add_subdirectory( "src/tools/mob_parse" ) #add_subdirectory("src/tools/pcb_reader") diff --git a/src/tools/quest_parser/CMakeLists.txt b/src/tools/quest_parser/CMakeLists.txt index 386495a5..66980060 100644 --- a/src/tools/quest_parser/CMakeLists.txt +++ b/src/tools/quest_parser/CMakeLists.txt @@ -30,10 +30,8 @@ set_target_properties(quest_parse PROPERTIES ) if (UNIX) - target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z) + target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z stdc++fs) else() target_link_libraries (quest_parse common xivdat libmysql zlib1) endif() -target_link_libraries(quest_parse ${Boost_LIBRARIES} ${Boost_LIBRARIES}) - diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp index 99f1c44d..06990703 100644 --- a/src/tools/quest_parser/main.cpp +++ b/src/tools/quest_parser/main.cpp @@ -4,8 +4,8 @@ #include #include #include +#include -#include #include #include @@ -15,10 +15,11 @@ #include #include -#include #include #include +#include + Core::Logger g_log; Core::Data::ExdDataGenerated g_exdDataGen; @@ -62,7 +63,7 @@ std::string titleCase( const std::string& str ) } void -createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set< std::string >& additionalList, int questId ) +createScript( std::shared_ptr< Core::Data::Quest >& pQuestData, std::set< std::string >& additionalList, int questId ) { std::string header( "// This is an automatically generated C++ script template\n" @@ -125,7 +126,10 @@ createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set< std: else { std::string seqName = titleCase( entry ); - boost::replace_all( seqName, "_", "" ); + + seqName.erase( std::remove_if( seqName.begin(), seqName.end(), []( const char c ) { + return c == '_'; + }), seqName.end()); std::string seqId = entry.substr( 4 ); seqStr += " " + seqName + " = " + seqId + ",\n"; @@ -252,7 +256,11 @@ createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set< std: for( auto& entity : script_entities ) { auto name = titleCase( entity ); - boost::replace_all( name, "_", "" ); + + name.erase( std::remove_if( name.begin(), name.end(), []( const char c ) { + return c == '_'; + }), name.end()); + sentities += " static constexpr auto " + name + ";\n"; }