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

fixed style

Browse source
This commit is contained in:
AriAvery 2018-07-16 11:58:25 +02:00
parent 9aeba7a0b3
commit d31a33732c
5 changed files with 54 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1308,24 +1308,24 @@ struct FFXIVIpcPerformNote : FFXIVIpcBasePacket<PerformNote>
struct FFXIVIpcWardInfo : FFXIVIpcBasePacket<WardInfo> struct FFXIVIpcWardInfo : FFXIVIpcBasePacket<WardInfo>
{ {
uint16_t pad0; uint16_t unknown0;
uint16_t wardNum; // set 1 for "Mist, Ward 2" uint16_t wardNum; // set 1 for "Mist, Ward 2"
uint16_t zoneId; uint16_t zoneId;
uint16_t worldId; uint16_t worldId;
uint8_t pad1; uint8_t unknown1;
uint8_t SubInstance; // (default : 1/2) uint8_t subInstance; // (default : 1/2)
uint8_t pad3; uint8_t unknown3;
uint8_t pad4; uint8_t unknown4;
uint8_t pad5; uint8_t unknown5;
uint8_t pad6; uint8_t unknown6;
uint8_t pad7; uint8_t unknown7;
uint8_t pad8; uint8_t unknown8;
struct { struct {
uint8_t HouseSize; //1 = small, 2 = middle, 3 = big; 1 uint8_t houseSize; //1 = small, 2 = middle, 3 = big; 1
uint8_t HouseState; //1 = for sell, 2 = sold, 3 = hasOwner, 0x0A = House sharing; 2 uint8_t houseState; //1 = for sell, 2 = sold, 3 = hasOwner, 0x0A = House sharing; 2
uint8_t iconColor; //HouseState has to be 3; 1 = Private, 2 = FC House; 4 uint8_t iconColor; //HouseState has to be 3; 1 = Private, 2 = FC House; 4
uint8_t iconIconAdd; //Heart Icon = 2; 6 uint8_t iconAddIcon; //Heart Icon = 2; 6
uint32_t pad9; //can be 0 (default) maybe fcId; 8 uint32_t unknown9; //can be 0 (default) maybe fcId; 8
uint32_t fcIcon; //can be 0 (default); 12 uint32_t fcIcon; //can be 0 (default); 12
uint32_t fcIconColor; //can be 0 (default); 16 uint32_t fcIconColor; //can be 0 (default); 16
uint16_t houseRoofId; //18 uint16_t houseRoofId; //18
@ -1342,9 +1342,9 @@ struct FFXIVIpcWardInfo : FFXIVIpcBasePacket<WardInfo>
struct FFXIVIpcWardYardInfo : FFXIVIpcBasePacket<WardYardInfo> struct FFXIVIpcWardYardInfo : FFXIVIpcBasePacket<WardYardInfo>
{ {
/* consistency check? */ /* consistency check? */
uint32_t pad1; //always 0xFFFFFFFF uint32_t unknown1; //always 0xFFFFFFFF
uint32_t pad2; //always 0xFFFFFFFF uint32_t unknown2; //always 0xFFFFFFFF
uint8_t pad3; //always 0xFF uint8_t unknown3; //always 0xFF
/* --- */ /* --- */
uint8_t packetNum; uint8_t packetNum;
uint16_t packetTotal; uint16_t packetTotal;
@ -1352,9 +1352,9 @@ struct FFXIVIpcWardYardInfo : FFXIVIpcBasePacket<WardYardInfo>
{ {
uint32_t itemId; uint32_t itemId;
uint16_t itemRotation; uint16_t itemRotation;
uint16_t pos_1; uint16_t pos_x;
uint16_t pos_2; uint16_t pos_y;
uint16_t pos_3; uint16_t pos_z;
} object[100]; } object[100];
}; };

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

@ -18,22 +18,22 @@ using namespace Core::Common;
using namespace Core::Network::Packets; using namespace Core::Network::Packets;
using namespace Core::Network::Packets::Server; using namespace Core::Network::Packets::Server;
Core::HousingZone::HousingZone(uint8_t wardNum, 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 )
{ {
} }
bool Core::HousingZone::init() bool Core::HousingZone::init()
{ {
uint32_t LandSetId; uint32_t landSetId;
for ( LandSetId = 0; LandSetId < 60; LandSetId++ ) for( landSetId = 0; landSetId < 60; landSetId++ )
{ {
//TODO: load house information here //TODO: load house information here
} }
@ -46,7 +46,7 @@ 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()) + "|" +
@ -56,29 +56,29 @@ void Core::HousingZone::onPlayerZoneIn(Entity::Player& player)
uint32_t yardPacketNum; uint32_t yardPacketNum;
auto wardInfoPackage = makeZonePacket< FFXIVIpcWardInfo >( player.getId() ); auto wardInfoPackage = makeZonePacket< FFXIVIpcWardInfo >( player.getId() );
auto wardYardInfoPackage = makeZonePacket< FFXIVIpcWardYardInfo >(player.getId()); auto wardYardInfoPackage = makeZonePacket< FFXIVIpcWardYardInfo >( player.getId() );
wardInfoPackage->data().wardNum = m_wardNum; wardInfoPackage->data().wardNum = m_wardNum;
wardInfoPackage->data().zoneId = player.getZoneId(); wardInfoPackage->data().zoneId = player.getZoneId();
//TODO: get current WorldId //TODO: get current WorldId
wardInfoPackage->data().worldId = 67; wardInfoPackage->data().worldId = 67;
//TODO: handle Subdivision //TODO: handle Subdivision
wardInfoPackage->data().SubInstance = 1; wardInfoPackage->data().subInstance = 1;
for (landSetId = 0; landSetId < 30 ; landSetId++) for( landSetId = 0; landSetId < 30 ; landSetId++ )
{ {
wardInfoPackage->data().landSet[landSetId].HouseSize = 1; wardInfoPackage->data().landSet[landSetId].houseSize = 1;
wardInfoPackage->data().landSet[landSetId].HouseState = 1; wardInfoPackage->data().landSet[landSetId].houseState = 1;
} }
wardYardInfoPackage->data().pad1 = 0xFFFFFFFF; wardYardInfoPackage->data().unknown1 = 0xFFFFFFFF;
wardYardInfoPackage->data().pad2 = 0xFFFFFFFF; wardYardInfoPackage->data().unknown2 = 0xFFFFFFFF;
wardYardInfoPackage->data().pad3 = 0xFF; wardYardInfoPackage->data().unknown3 = 0xFF;
wardYardInfoPackage->data().packetTotal = 8; wardYardInfoPackage->data().packetTotal = 8;
player.queuePacket( wardInfoPackage ); player.queuePacket( wardInfoPackage );
for (yardPacketNum = 0; yardPacketNum < wardYardInfoPackage->data().packetTotal; yardPacketNum++) for( yardPacketNum = 0; yardPacketNum < wardYardInfoPackage->data().packetTotal; yardPacketNum++ )
{ {
//Add Objects here //Add Objects here
wardYardInfoPackage->data().packetNum = yardPacketNum; wardYardInfoPackage->data().packetNum = yardPacketNum;

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

@ -6,24 +6,23 @@
namespace Core namespace Core
{ {
class HousingZone : public Zone class HousingZone : public Zone
{ {
public: public:
HousingZone( uint8_t wardNum, 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 );
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;
private: private:
uint8_t m_wardNum; uint8_t m_wardNum;
}; };
} }

11
src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
View file

@ -147,25 +147,24 @@ bool Core::TerritoryMgr::createHosuingTerritories()
//separate housing zones from default //separate housing zones from default
auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto pExdData = g_fw.get< Data::ExdDataGenerated >();
auto pLog = g_fw.get< Logger >(); auto pLog = g_fw.get< Logger >();
for ( const auto& territory : m_territoryTypeDetailCacheMap ) for( const auto& territory : m_territoryTypeDetailCacheMap )
{ {
auto territoryId = territory.first; auto territoryId = territory.first;
auto territoryInfo = territory.second; auto territoryInfo = territory.second;
uint32_t wardNum; uint32_t wardNum;
if ( territoryInfo->name.empty() ) if( territoryInfo->name.empty() )
continue; continue;
auto pPlaceName = pExdData->get< Core::Data::PlaceName >( territoryInfo->placeName ); auto pPlaceName = pExdData->get< Core::Data::PlaceName >( territoryInfo->placeName );
if (!pPlaceName || pPlaceName->name.empty() || !isHousingTerritory( territoryId ) ) if( !pPlaceName || pPlaceName->name.empty() || !isHousingTerritory( territoryId ) )
continue; continue;
for ( wardNum = 0; wardNum < 18; wardNum++ ) for( wardNum = 0; wardNum < 18; wardNum++ )
{ {
uint32_t guid = getNextInstanceId(); uint32_t guid = getNextInstanceId();
pLog->info(std::to_string( territoryId ) + pLog->info( std::to_string( territoryId ) +
"\t" + std::to_string( guid ) + "\t" + std::to_string( guid ) +
"\t" + std::to_string( territoryInfo->territoryIntendedUse ) + "\t" + std::to_string( territoryInfo->territoryIntendedUse ) +
"\t" + ( territoryInfo->name.length() <= 4 ? territoryInfo->name + "\t" : territoryInfo->name ) + "\t" + ( territoryInfo->name.length() <= 4 ? territoryInfo->name + "\t" : territoryInfo->name ) +

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

@ -66,7 +66,7 @@ namespace Core
bool createDefaultTerritories(); bool createDefaultTerritories();
bool createHosuingTerritories(); bool createHosuingTerritories();
/*! caches TerritoryType details into m_territoryTypeMap */ /*! caches TerritoryType details into m_territoryTypeMap */
void loadTerritoryTypeDetailCache(); void loadTerritoryTypeDetailCache();
@ -90,8 +90,8 @@ namespace Core
/*! returns true if the territoryType is a default non-instanced zone */ /*! returns true if the territoryType is a default non-instanced zone */
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 );