From 3de42fc67054226424e181f78f69adf94deda8b9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 6 Jan 2020 20:04:10 +1100
Subject: [PATCH 1/2] action_parse can take an exd path as a launch arg now

---
 src/tools/action_parse/main.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 ) )
   {

From 204ff7ec84722a42713fdf1e739716e2d5348816 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 6 Jan 2020 20:19:42 +1100
Subject: [PATCH 2/2] fix linux build

---
 src/scripts/common/warptaxi/WarpTaxi.cpp      | 2 +-
 src/world/Actor/Player.cpp                    | 2 +-
 src/world/Network/Handlers/PacketHandlers.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 <Actor/Player.h>
 
 #include <datReader/DatCategories/bg/LgbTypes.h>
-#include <datReader/DatCategories/bg/Lgb.h>
+#include <datReader/DatCategories/bg/lgb.h>
 
 #include "Territory/InstanceObjectCache.h"
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 4eae61b9..5bca5e76 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -4,7 +4,7 @@
 #include <Logging/Logger.h>
 #include <Exd/ExdDataGenerated.h>
 #include <datReader/DatCategories/bg/LgbTypes.h>
-#include <datReader/DatCategories/bg/Lgb.h>
+#include <datReader/DatCategories/bg/lgb.h>
 
 #include <Network/PacketContainer.h>
 #include <Network/CommonActorControl.h>
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 <Util/Util.h>
 
 #include <datReader/DatCategories/bg/LgbTypes.h>
-#include <datReader/DatCategories/bg/Lgb.h>
+#include <datReader/DatCategories/bg/lgb.h>
 
 #include <unordered_map>
 #include <Network/PacketDef/Zone/ClientZoneDef.h>