diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp index e8a8de97..fe442249 100644 --- a/src/scripts/common/warptaxi/WarpTaxi.cpp +++ b/src/scripts/common/warptaxi/WarpTaxi.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include "Territory/InstanceObjectCache.h" diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp index ff750cf6..5f7afc07 100644 --- a/src/tools/action_parse/main.cpp +++ b/src/tools/action_parse/main.cpp @@ -25,7 +25,7 @@ namespace fs = std::experimental::filesystem; using namespace Sapphire; -const std::string datLocation( "/home/mordred/sqpack" ); +std::string datLocation( "/home/mordred/sqpack" ); //const std::string datLocation( "/mnt/c/Program Files (x86)/Steam/steamapps/common/FINAL FANTASY XIV Online/game/sqpack" ); struct ActionEntry @@ -69,7 +69,7 @@ uint32_t stripNonNumerics( std::string& str ) return std::atoi( str.c_str() ); } -int main() +int main( int argc, char* argv[] ) { Logger::init( "action_parse" ); @@ -77,6 +77,11 @@ int main() if( !fs::exists( "ActionLutData.cpp.tmpl" ) ) throw std::runtime_error( "ActionLut.cpp.tmpl is missing in working directory" ); + if( argc == 2 ) + { + datLocation = std::string( argv[ 1 ] ); + } + Logger::info( "Setting up EXD data" ); if( !g_exdData.init( datLocation ) ) { diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index 797d9edd..db59a4ee 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp index d6682408..5e23045d 100644 --- a/src/world/Network/Handlers/PacketHandlers.cpp +++ b/src/world/Network/Handlers/PacketHandlers.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include