mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Code Activity

Merge branch 'master' into 4-3-exdfixes

Browse source
This commit is contained in:
goaaats 2018-05-22 20:19:35 +02:00 • committed by GitHub
commit fcc29707dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1602 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

729
src/common/Exd/ExdDataGenerated.cpp
View file

File diff suppressed because it is too large Load diff

1004
src/common/Exd/ExdDataGenerated.h
View file

File diff suppressed because it is too large Load diff

2
src/servers/sapphire_zone/Actor/Player.cpp
View file

@ -317,7 +317,7 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
}
setStateFlag( PlayerStateFlag::BetweenAreas );
auto targetPos = pTeriMgr->getTerritoryPosition( data->levelId );
auto targetPos = pTeriMgr->getTerritoryPosition( data->level.at( 0 ) );
Common::FFXIVARR_POSITION3 pos;
pos.x = 0;

4
src/tools/exd_struct_gen/main.cpp
View file

@ -52,8 +52,8 @@ std::vector< std::string > cppKeyWords
"class"
};
std::string datLocation( "E:\\Steam\\SteamApps\\common\\FINAL FANTASY XIV Online\\game\\sqpack" );
//std::string datLocation( "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv" );
//std::string datLocation( "/opt/sapphire_3_15_0/bin/sqpack" );
std::string datLocation( "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" );
std::map< uint8_t, std::string > g_typeMap;