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

better name

Browse source
This commit is contained in:
collett 2020-05-22 14:01:26 +09:00
parent 965b88f37d
commit 6c0b2bfd64
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -376,7 +376,7 @@ namespace Sapphire::Network::Packets
PerformNoteHandler = 0x029B, // updated 4.3 PerformNoteHandler = 0x029B, // updated 4.3
MapInteractionHandler = 0x0285, // updated 5.25 WorldInteractionHandler = 0x0285, // updated 5.25
ShopMessage = 0x00C1, // updated 5.25 ShopMessage = 0x00C1, // updated 5.25
LootMessage = 0x00B1, // updated 5.25 LootMessage = 0x00B1, // updated 5.25
}; };

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

@ -344,8 +344,8 @@ struct FFXIVIpcFreeCompanyUpdateShortMessageHandler :
uint16_t unknown2; uint16_t unknown2;
}; };
struct FFXIVIpcMapInteractionHandler : struct FFXIVIpcWorldInteractionHandler :
FFXIVIpcBasePacket< MapInteractionHandler > FFXIVIpcBasePacket< WorldInteractionHandler >
{ {
uint32_t action; uint32_t action;
uint32_t unknown2; uint32_t unknown2;

2
src/world/Network/GameConnection.cpp
View file

@ -130,7 +130,7 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH
setZoneHandler( ClientZoneIpcType::MarketBoardRequestItemListings, "MarketBoardRequestItemListings", setZoneHandler( ClientZoneIpcType::MarketBoardRequestItemListings, "MarketBoardRequestItemListings",
&GameConnection::marketBoardRequestItemListings ); &GameConnection::marketBoardRequestItemListings );
setZoneHandler( ClientZoneIpcType::MapInteractionHandler, "MapInteractionHandler", &GameConnection::eventHandlerMapInteraction ); setZoneHandler( ClientZoneIpcType::WorldInteractionHandler, "WorldInteractionHandler", &GameConnection::eventHandlerWorldInteraction );
setChatHandler( ClientChatIpcType::TellReq, "TellReq", &GameConnection::tellHandler ); setChatHandler( ClientChatIpcType::TellReq, "TellReq", &GameConnection::tellHandler );

2
src/world/Network/GameConnection.h
View file

@ -143,7 +143,7 @@ namespace Sapphire::Network
DECLARE_HANDLER( eventHandlerShop ); DECLARE_HANDLER( eventHandlerShop );
DECLARE_HANDLER( eventHandlerMapInteraction ); DECLARE_HANDLER( eventHandlerWorldInteraction );
DECLARE_HANDLER( eventHandlerLinkshell ); DECLARE_HANDLER( eventHandlerLinkshell );

6
src/world/Network/Handlers/EventHandlers.cpp
View file

@ -276,12 +276,12 @@ void Sapphire::Network::GameConnection::eventHandlerShop( const Packets::FFXIVAR
scriptMgr.onTalk( player, player.getId(), eventId ); scriptMgr.onTalk( player, player.getId(), eventId );
} }
void Sapphire::Network::GameConnection::eventHandlerMapInteraction( const Packets::FFXIVARR_PACKET_RAW& inPacket, void Sapphire::Network::GameConnection::eventHandlerWorldInteraction( const Packets::FFXIVARR_PACKET_RAW& inPacket,
Entity::Player& player ) Entity::Player& player )
{ {
const auto packet = ZoneChannelPacket< Client::FFXIVIpcMapInteractionHandler >( inPacket ); const auto packet = ZoneChannelPacket< Client::FFXIVIpcWorldInteractionHandler >( inPacket );
auto action = packet.data().action; auto action = packet.data().action;
player.sendDebug( "MapInteraction {}", action ); player.sendDebug( "WorldInteraction {}", action );
if( action == 0xD4 && player.getRace() == 3 ) // enter dwarf house lalafell only of course if( action == 0xD4 && player.getRace() == 3 ) // enter dwarf house lalafell only of course
{ {
// looks like shit but IT WORKS. // looks like shit but IT WORKS.