mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity

Prelim housing eventhandler

Browse source
This commit is contained in:
Mordred 2018-11-22 00:04:26 +01:00
parent e71128ba12
commit 7763f11478
6 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,11 +291,13 @@ namespace Core::Network::Packets
OutOfRangeEventHandler = 0x014E, // updated 4.4 OutOfRangeEventHandler = 0x014E, // updated 4.4
EnterTeriEventHandler = 0x014F, // updated 4.4 EnterTeriEventHandler = 0x014F, // updated 4.4
ShopEventHandler = 0x0151, // updated 4.4
ReturnEventHandler = 0x0154, // updated 4.4 ReturnEventHandler = 0x0154, // updated 4.4
TradeReturnEventHandler = 0x0155, // updated 4.4 TradeReturnEventHandler = 0x0155, // updated 4.4
LinkshellEventHandler = 0x0150, // updated 4.1 ?? LinkshellEventHandler = 0x1150, // updated 4.1 ??
LinkshellEventHandler1 = 0x0151, // updated 4.1 ?? LinkshellEventHandler1 = 0x1151, // updated 4.1 ??
LandRenameHandler = 0x0171, // updated 4.4 LandRenameHandler = 0x0171, // updated 4.4

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

@ -163,6 +163,13 @@ struct FFXIVIpcChatHandler :
/* 001A */ char message[1012]; /* 001A */ char message[1012];
}; };
struct FFXIVIpcShopEventHandler :
FFXIVIpcBasePacket< ShopEventHandler >
{
/* 0000 */ uint32_t eventId;
/* 0004 */ uint32_t param;
};
struct FFXIVIpcLinkshellEventHandler : struct FFXIVIpcLinkshellEventHandler :
FFXIVIpcBasePacket< LinkshellEventHandler > FFXIVIpcBasePacket< LinkshellEventHandler >
{ {

2
src/servers/sapphire_zone/Actor/PlayerEvent.cpp
View file

@ -158,7 +158,7 @@ void Core::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
Core::Event::EventHandlerPtr Core::Entity::Player::bootstrapSceneEvent( uint32_t eventId, uint32_t flags ) Core::Event::EventHandlerPtr Core::Entity::Player::bootstrapSceneEvent( uint32_t eventId, uint32_t flags )
{ {
auto pEvent = getEvent( eventId ); auto pEvent = getEvent( eventId );
if( !pEvent ) if( !pEvent )
{ {

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

@ -98,8 +98,12 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive,
setZoneHandler( ClientZoneIpcType::TradeReturnEventHandler, "EventHandlerReturn", setZoneHandler( ClientZoneIpcType::TradeReturnEventHandler, "EventHandlerReturn",
&GameConnection::eventHandlerReturn ); &GameConnection::eventHandlerReturn );
setZoneHandler( ClientZoneIpcType::ShopEventHandler, "ShopEventHandler",
&GameConnection::eventHandlerShop );
setZoneHandler( ClientZoneIpcType::LinkshellEventHandler, "LinkshellEventHandler", setZoneHandler( ClientZoneIpcType::LinkshellEventHandler, "LinkshellEventHandler",
&GameConnection::eventHandlerLinkshell ); &GameConnection::eventHandlerLinkshell );
setZoneHandler( ClientZoneIpcType::LinkshellEventHandler1, "LinkshellEventHandler1", setZoneHandler( ClientZoneIpcType::LinkshellEventHandler1, "LinkshellEventHandler1",
&GameConnection::eventHandlerLinkshell ); &GameConnection::eventHandlerLinkshell );

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

@ -139,6 +139,8 @@ namespace Core::Network
DECLARE_HANDLER( eventHandlerReturn ); DECLARE_HANDLER( eventHandlerReturn );
DECLARE_HANDLER( eventHandlerShop );
DECLARE_HANDLER( eventHandlerLinkshell ); DECLARE_HANDLER( eventHandlerLinkshell );
DECLARE_HANDLER( logoutHandler ); DECLARE_HANDLER( logoutHandler );

27
src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
View file

@ -1,4 +1,5 @@
#include <Common.h> #include <Common.h>
#include <Logging/Logger.h>
#include <Exd/ExdDataGenerated.h> #include <Exd/ExdDataGenerated.h>
#include <Network/CommonNetwork.h> #include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h> #include <Network/GamePacketNew.h>
@ -251,4 +252,30 @@ void Core::Network::GameConnection::eventHandlerLinkshell( const Packets::FFXIVA
} }
void Core::Network::GameConnection::eventHandlerShop( const Packets::FFXIVARR_PACKET_RAW& inPacket,
Entity::Player& player )
{
const auto packet = ZoneChannelPacket< Client::FFXIVIpcShopEventHandler >( inPacket );
auto pLog = g_fw.get< Logger >();
auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
auto pExdData = g_fw.get< Data::ExdDataGenerated >();
const auto eventId = packet.data().eventId;
auto eventType = static_cast< uint16_t >( eventId >> 16 );
std::string eventName = "onShop";
std::string objName = Event::getEventName( eventId );
player.sendDebug( "EventId: " +
std::to_string( eventId ) +
" (0x" + Util::intToHexString( static_cast< uint64_t >( eventId & 0xFFFFFFF ), 8 ) + ")" );
player.sendDebug( "Calling: " + objName + "." + eventName );
player.eventStart( 0, eventId, Event::EventHandler::UI, 0, 0 );
}