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

added door positions

Browse source
This commit is contained in:
AriAvery 2018-11-28 08:39:36 +01:00
parent 9c3121eaf4
commit 4abbbf7c1c
5 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2909,6 +2909,9 @@ Core::Data::HousingFurniture::HousingFurniture( uint32_t row_id, Core::Data::Exd
Core::Data::HousingMapMarkerInfo::HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) Core::Data::HousingMapMarkerInfo::HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData )
{ {
auto row = exdData->m_HousingMapMarkerInfoDat.get_row( row_id, subRow ); auto row = exdData->m_HousingMapMarkerInfoDat.get_row( row_id, subRow );
x = exdData->getField< float >( row, 0 );
y = exdData->getField< float >( row, 1 );
z = exdData->getField< float >( row, 2 );
map = exdData->getField< uint16_t >( row, 4 ); map = exdData->getField< uint16_t >( row, 4 );
} }

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

@ -3048,6 +3048,9 @@ struct HousingFurniture
struct HousingMapMarkerInfo struct HousingMapMarkerInfo
{ {
uint16_t map; uint16_t map;
float x;
float y;
float z;
HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData );
}; };

2
src/common/Network/PacketDef/Ipcs.h
View file

@ -216,7 +216,9 @@ namespace Core::Network::Packets
// Unknown IPC types that still need to be sent // Unknown IPC types that still need to be sent
// TODO: figure all these out properly // TODO: figure all these out properly
// Quests related op codes
IPCTYPE_UNK_320 = 0x0249, // updated 4.4 IPCTYPE_UNK_320 = 0x0249, // updated 4.4
IPCTYPE_UPDATE_320 = 0x024A, // updated 4.4
IPCTYPE_UNK_322 = 0x024B, // updated 4.4 IPCTYPE_UNK_322 = 0x024B, // updated 4.4
}; };

15
src/servers/sapphire_zone/Zone/House.cpp
View file

@ -52,6 +52,16 @@ Core::House::House( uint32_t houseId, uint32_t landSetId, uint8_t landId, uint8_
m_houseParts[ i ] = { models[ i ], colours[ i ] }; m_houseParts[ i ] = { models[ i ], colours[ i ] };
} }
} }
auto pExdData = g_fw.get< Data::ExdDataGenerated >();
auto mapMarker = pExdData->get< Core::Data::HousingMapMarkerInfo >( getTerritoryTypeId(), getLandId() );
if( mapMarker )
{
m_doorPosition.x = mapMarker->x;
m_doorPosition.y = mapMarker->y;
m_doorPosition.z = mapMarker->z;
}
} }
Core::House::~House() Core::House::~House()
@ -120,6 +130,11 @@ uint32_t Core::House::getHouseId() const
return m_houseId; return m_houseId;
} }
Core::Common::FFXIVARR_POSITION3 Core::House::getDoorPosition() const
{
return m_doorPosition;
}
uint8_t Core::House::getHousePartColor( Common::HousePartSlot slot ) const uint8_t Core::House::getHousePartColor( Common::HousePartSlot slot ) const
{ {
return m_houseParts[ slot ].second; return m_houseParts[ slot ].second;

3
src/servers/sapphire_zone/Zone/House.h
View file

@ -24,6 +24,7 @@ namespace Core
uint8_t getWardNum() const; uint8_t getWardNum() const;
uint16_t getTerritoryTypeId() const; uint16_t getTerritoryTypeId() const;
uint32_t getHouseId() const; uint32_t getHouseId() const;
Common::FFXIVARR_POSITION3 getDoorPosition() const;
//functions //functions
void setHousePart( Common::HousePartSlot slot, uint32_t id ); void setHousePart( Common::HousePartSlot slot, uint32_t id );
@ -48,6 +49,8 @@ namespace Core
std::string m_estateMessage; std::string m_estateMessage;
std::string m_houseName; std::string m_houseName;
Common::FFXIVARR_POSITION3 m_doorPosition;
}; };
} }