mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 19:17:45 +00:00
Code Activity

Merge remote-tracking branch 'remotes/origin/develop' into develop_c

Browse source
This commit is contained in:
collett 2020-01-06 19:20:10 +09:00
commit feec126341
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/common/warptaxi/WarpTaxi.cpp
View file

@ -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"

9
src/tools/action_parse/main.cpp
View file

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

2
src/world/Actor/Player.cpp
View file

@ -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>

2
src/world/Network/Handlers/PacketHandlers.cpp
View file

@ -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>