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

name fixes

Browse source
This commit is contained in:
AriAvery 2018-11-12 09:32:20 +01:00
parent 1a618ee410
commit c9eb1bafce
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -189,7 +189,7 @@ namespace Core::Network::Packets
LandPriceUpdate = 0x0224, // updated 4.4 LandPriceUpdate = 0x0224, // updated 4.4
LandInfoSign = 0x0225, // updated 4.4 LandInfoSign = 0x0225, // updated 4.4
RenameLand = 0x0226, // updated 4.4 LandRename = 0x0226, // updated 4.4
LandPermissionSlot = 0x0228, // updated 4.4 LandPermissionSlot = 0x0228, // updated 4.4
@ -296,7 +296,7 @@ namespace Core::Network::Packets
LinkshellEventHandler = 0x0150, // updated 4.1 ?? LinkshellEventHandler = 0x0150, // updated 4.1 ??
LinkshellEventHandler1 = 0x0151, // updated 4.1 ?? LinkshellEventHandler1 = 0x0151, // updated 4.1 ??
RenameLandHandler = 0x0171, // updated 4.4 LandRenameHandler = 0x0171, // updated 4.4
SetSharedEstateSettings = 0x0177, // updated 4.4 SetSharedEstateSettings = 0x0177, // updated 4.4

2
src/common/Network/PacketDef/Zone/ClientZoneDef.h
View file

@ -190,7 +190,7 @@ struct FFXIVIpcInventoryModifyHandler :
}; };
struct FFXIVIpcRenameLandHandler : struct FFXIVIpcRenameLandHandler :
FFXIVIpcBasePacket< RenameLandHandler > FFXIVIpcBasePacket< LandRenameHandler >
{ {
/* 0000 */ uint16_t landId; /* 0000 */ uint16_t landId;
/* 0002 */ uint16_t wardNum; /* 0002 */ uint16_t wardNum;

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

@ -1632,7 +1632,7 @@ struct FFXIVIpcLandInfoSign : FFXIVIpcBasePacket< LandInfoSign >
uint8_t tag[3]; uint8_t tag[3];
}; };
struct FFXIVIpcRenameLand : FFXIVIpcBasePacket< RenameLand > struct FFXIVIpcLandRename : FFXIVIpcBasePacket< LandRename >
{ {
uint16_t landId; uint16_t landId;
uint16_t wardNum; uint16_t wardNum;

2
src/servers/sapphire_zone/Network/GameConnection.cpp
View file

@ -84,7 +84,7 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive,
&GameConnection::inventoryModifyHandler ); &GameConnection::inventoryModifyHandler );
setZoneHandler( ClientZoneIpcType::BuildPresetHandler, "BuildPresetHandler", &GameConnection::eventHandlerTalk ); setZoneHandler( ClientZoneIpcType::BuildPresetHandler, "BuildPresetHandler", &GameConnection::eventHandlerTalk );
setZoneHandler( ClientZoneIpcType::RenameLandHandler, "RenameLandHandler", &GameConnection::renameLandHandler ); setZoneHandler( ClientZoneIpcType::LandRenameHandler, "LandRenameHandler", &GameConnection::landRenameHandler );
setZoneHandler( ClientZoneIpcType::TalkEventHandler, "EventHandlerTalk", &GameConnection::eventHandlerTalk ); setZoneHandler( ClientZoneIpcType::TalkEventHandler, "EventHandlerTalk", &GameConnection::eventHandlerTalk );
setZoneHandler( ClientZoneIpcType::EmoteEventHandler, "EventHandlerEmote", &GameConnection::eventHandlerEmote ); setZoneHandler( ClientZoneIpcType::EmoteEventHandler, "EventHandlerEmote", &GameConnection::eventHandlerEmote );
setZoneHandler( ClientZoneIpcType::WithinRangeEventHandler, "EventHandlerWithinRange", setZoneHandler( ClientZoneIpcType::WithinRangeEventHandler, "EventHandlerWithinRange",

2
src/servers/sapphire_zone/Network/GameConnection.h
View file

@ -162,7 +162,7 @@ namespace Core::Network
DECLARE_HANDLER( performNoteHandler ); DECLARE_HANDLER( performNoteHandler );
DECLARE_HANDLER( renameLandHandler ); DECLARE_HANDLER( landRenameHandler );
DECLARE_HANDLER( buildPresetHandler ); DECLARE_HANDLER( buildPresetHandler );

2
src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -392,7 +392,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
} }
case ClientTriggerType::RequestHousingRename: case ClientTriggerType::RequestHousingRename:
{ {
auto landRenamePacket = makeZonePacket< Server::FFXIVIpcRenameLand >( player.getId() ); auto landRenamePacket = makeZonePacket< Server::FFXIVIpcLandRename >( player.getId() );
uint8_t ward = ( param12 & 0xFF00 ) >> 8; uint8_t ward = ( param12 & 0xFF00 ) >> 8;
uint8_t plot = ( param12 & 0xFF ); uint8_t plot = ( param12 & 0xFF );

2
src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
View file

@ -652,7 +652,7 @@ void Core::Network::GameConnection::performNoteHandler( const Core::Network::Pac
player.sendToInRangeSet( performPacket ); player.sendToInRangeSet( performPacket );
} }
void Core::Network::GameConnection::renameLandHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, void Core::Network::GameConnection::landRenameHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
Entity::Player& player ) Entity::Player& player )
{ {
const auto packet = ZoneChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket ); const auto packet = ZoneChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket );