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

some more initui figured out

Browse source
This commit is contained in:
Adam 2018-03-17 01:25:44 +11:00
parent 39df53f7d0
commit 15dd60534c
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -730,8 +730,8 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint16_t pvpFrontlineWeekly2nd;
uint16_t pvpFrontlineWeekly3rd;
uint8_t unknown61E;
uint8_t unknown61F[32];
uint8_t unknown63F[22];
uint8_t centurioSealHunts[32];
uint8_t alliedSealHunts[22];
uint8_t tripleTriadCards[28];
uint8_t unknown671[11];
uint8_t unknownMask67C[22];
@ -739,7 +739,7 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint8_t orchestrionMask[40];
uint8_t hallOfNoviceCompleteMask[3];
uint8_t unknownMask6C0[11];
uint8_t unknownMask6CB[16];
uint8_t animaRelicMask[16]; // [2] = anima glass key item, [1] = ulan's note key item
uint8_t unknown6DB[14];
uint8_t unlockedRaids[28];
uint8_t unlockedDungeons[18];

10
src/servers/sapphire_zone/Zone/InstanceContent.cpp
View file

@ -27,19 +27,19 @@ using namespace Core::Common;
using namespace Core::Network::Packets;
using namespace Core::Network::Packets::Server;
Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > instanceConfiguration,
Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceConfiguration,
uint32_t guId,
const std::string& internalName,
const std::string& contentName,
uint32_t instanceContentId )
: Zone( static_cast< uint16_t >( instanceConfiguration->territoryType ), guId, internalName, contentName ),
: Zone( static_cast< uint16_t >( pInstanceConfiguration->territoryType ), guId, internalName, contentName ),
Director( Event::Director::InstanceContent, instanceContentId ),
m_instanceConfiguration( instanceConfiguration ),
m_instanceConfiguration( pInstanceConfiguration ),
m_instanceContentId( instanceContentId ),
m_state( Created ),
m_pEntranceEObj( nullptr ),
m_instanceCommenceTime( 0 ),
m_currentBgm( instanceConfiguration->bGM )
m_currentBgm( pInstanceConfiguration->bGM )
{
}
@ -107,7 +107,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
if( m_boundPlayerIds.size() == 0 )
return;
for( const auto& playerId : m_boundPlayerIds )
for( const auto playerId : m_boundPlayerIds )
{
auto it = m_playerMap.find( playerId );
if( it == m_playerMap.end() )

2
src/servers/sapphire_zone/Zone/InstanceContent.h
View file

@ -22,7 +22,7 @@ public:
DutyFinished
};
InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > instanceConfiguration,
InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceConfiguration,
uint32_t guId,
const std::string& internalName,
const std::string& contentName,