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

Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop

Browse source
This commit is contained in:
Mordred 2018-07-08 00:43:08 +02:00
commit bc01b0ccb1
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
View file

@ -91,7 +91,7 @@ struct FFXIVIpcCharList : FFXIVIpcBasePacket<LobbyCharList>
char nameChara[32]; char nameChara[32];
char nameServer[32]; char nameServer[32];
char nameServer1[32]; char nameServer1[32];
char charDetailJson[1030]; char charDetailJson[1028];
} charaDetails[2]; } charaDetails[2];
}; };

14
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -624,18 +624,20 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
unsigned short pvpWolfFoldWeeklyMatches; unsigned short pvpWolfFoldWeeklyMatches;
unsigned short pvpWolfFoldWeeklyVictories; unsigned short pvpWolfFoldWeeklyVictories;
unsigned short pvpStats[6]; unsigned short pvpStats[6];
unsigned short playerCommendations; unsigned short unknown74;
unsigned short pvpStats1; unsigned short pvpStats1;
unsigned char frontlineCampaigns[4]; unsigned char frontlineCampaigns[4];
unsigned short frontlineCampaignsWeekly; unsigned short frontlineCampaignsWeekly;
unsigned char currentRelic; unsigned char currentRelic;
unsigned char currentBook; unsigned char currentBook;
unsigned char masterCrafterMask; unsigned char masterCrafterMask;
unsigned char unknown69; unsigned char unknown81;
unsigned char unknown6A; unsigned char unknown82;
unsigned char unknown6B; unsigned char unknown83;
unsigned char unknown6C[4]; unsigned char unknown84[4];
unsigned char unknown70[34]; unsigned char unknown88[10];
unsigned short playerCommendations;
unsigned char unknown94[22];
unsigned short unknown18; unsigned short unknown18;
unsigned char maxLevel; unsigned char maxLevel;
unsigned char expansion; unsigned char expansion;

1
src/servers/sapphire_lobby/GameConnection.cpp
View file

@ -191,7 +191,6 @@ void Core::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, ui
charListPacket->data().counter = ( i * 4 ) + 1; charListPacket->data().counter = ( i * 4 ) + 1;
charListPacket->data().unknown4 = 128; charListPacket->data().unknown4 = 128;
} }
Packets::LobbyPacketContainer pRP( m_encKey ); Packets::LobbyPacketContainer pRP( m_encKey );
pRP.addPacket( charListPacket ); pRP.addPacket( charListPacket );
sendPacket( pRP ); sendPacket( pRP );

3
src/servers/sapphire_zone/Actor/Chara.cpp
View file

@ -34,7 +34,8 @@ using namespace Core::Network::Packets::Server;
using namespace Core::Network::ActorControl; using namespace Core::Network::ActorControl;
Core::Entity::Chara::Chara( ObjKind type ) : Core::Entity::Chara::Chara( ObjKind type ) :
Actor( type ) Actor( type ),
m_targetId( INVALID_GAME_OBJECT_ID )
{ {
// initialize the free slot queue // initialize the free slot queue
for( uint8_t i = 0; i < MAX_STATUS_EFFECTS; i++ ) for( uint8_t i = 0; i < MAX_STATUS_EFFECTS; i++ )