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

fixed style #3

Browse source
This commit is contained in:
AriAvery 2018-07-16 12:37:04 +02:00
parent 627a816f6e
commit d5b7520e22
3 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/servers/sapphire_zone/Zone/HousingZone.cpp
View file

@ -22,8 +22,8 @@ Core::HousingZone::HousingZone( uint8_t wardNum,
uint16_t territoryId, uint16_t territoryId,
uint32_t guId, uint32_t guId,
const std::string& internalName, const std::string& internalName,
const std::string& contentName ) const std::string& contentName ) :
: Zone( territoryId, guId, internalName, contentName ), Zone( territoryId, guId, internalName, contentName ),
m_wardNum( wardNum ) m_wardNum( wardNum )
{ {
@ -49,41 +49,42 @@ Core::HousingZone::~HousingZone()
void Core::HousingZone::onPlayerZoneIn( Entity::Player& player ) void Core::HousingZone::onPlayerZoneIn( Entity::Player& player )
{ {
auto pLog = g_fw.get< Logger >(); auto pLog = g_fw.get< Logger >();
pLog->debug( "HousingZone::onPlayerZoneIn: Zone#" + std::to_string(getGuId()) + "|" + pLog->debug( "HousingZone::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|" +
+ ", Entity#" + std::to_string( player.getId() ) ); + ", Entity#" + std::to_string( player.getId() ) );
uint32_t landSetId; uint32_t landSetId;
uint32_t yardPacketNum; uint32_t yardPacketNum;
uint32_t yardPacketTotal = 8;
auto wardInfoPackage = makeZonePacket< FFXIVIpcWardInfo >( player.getId() ); auto wardInfoPacket = makeZonePacket< FFXIVIpcWardInfo >( player.getId() );
auto wardYardInfoPackage = makeZonePacket< FFXIVIpcWardYardInfo >( player.getId() );
wardInfoPackage->data().wardNum = m_wardNum; wardInfoPacket->data().wardNum = m_wardNum;
wardInfoPackage->data().zoneId = player.getZoneId(); wardInfoPacket->data().zoneId = player.getZoneId();
//TODO: get current WorldId //TODO: get current WorldId
wardInfoPackage->data().worldId = 67; wardInfoPacket->data().worldId = 67;
//TODO: handle Subdivision //TODO: handle Subdivision
wardInfoPackage->data().subInstance = 1; wardInfoPacket->data().subInstance = 1;
for( landSetId = 0; landSetId < 30 ; landSetId++ ) for( landSetId = 0; landSetId < 30 ; landSetId++ )
{ {
wardInfoPackage->data().landSet[landSetId].houseSize = 1; wardInfoPacket->data().landSet[landSetId].houseSize = 1;
wardInfoPackage->data().landSet[landSetId].houseState = 1; wardInfoPacket->data().landSet[landSetId].houseState = 1;
} }
wardYardInfoPackage->data().unknown1 = 0xFFFFFFFF; player.queuePacket( wardInfoPacket );
wardYardInfoPackage->data().unknown2 = 0xFFFFFFFF;
wardYardInfoPackage->data().unknown3 = 0xFF;
wardYardInfoPackage->data().packetTotal = 8;
player.queuePacket( wardInfoPackage ); for( yardPacketNum = 0; yardPacketNum < yardPacketTotal; yardPacketNum++ )
for( yardPacketNum = 0; yardPacketNum < wardYardInfoPackage->data().packetTotal; yardPacketNum++ )
{ {
//Add Objects here auto wardYardInfoPacket = makeZonePacket< FFXIVIpcWardYardInfo >( player.getId() );
wardYardInfoPackage->data().packetNum = yardPacketNum; wardYardInfoPacket->data().unknown1 = 0xFFFFFFFF;
wardYardInfoPacket->data().unknown2 = 0xFFFFFFFF;
wardYardInfoPacket->data().unknown3 = 0xFF;
wardYardInfoPacket->data().packetNum = yardPacketNum;
wardYardInfoPacket->data().packetTotal = yardPacketTotal;
player.queuePacket( wardYardInfoPackage ); //TODO: Add Objects here
player.queuePacket( wardYardInfoPacket );
} }
} }

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

@ -17,7 +17,7 @@ class HousingZone : public Zone
virtual ~HousingZone(); virtual ~HousingZone();
bool init() override; bool init() override;
void onPlayerZoneIn(Entity::Player& player) override; void onPlayerZoneIn( Entity::Player& player ) override;
/* returns current ward number for this zone */ /* returns current ward number for this zone */
uint8_t getWardNum() const; uint8_t getWardNum() const;

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

@ -91,7 +91,7 @@ namespace Core
bool isDefaultTerritory( uint32_t territoryTypeId ) const; bool isDefaultTerritory( uint32_t territoryTypeId ) const;
/*! returns true if the territoryType is a housing zone */ /*! returns true if the territoryType is a housing zone */
bool isHousingTerritory(uint32_t territoryTypeId) const; bool isHousingTerritory( uint32_t territoryTypeId ) const;
/*! creates a new instance for a given territoryTypeId */ /*! creates a new instance for a given territoryTypeId */
ZonePtr createTerritoryInstance( uint32_t territoryTypeId ); ZonePtr createTerritoryInstance( uint32_t territoryTypeId );