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

Merge remote-tracking branch 'origin/SQL_REWRITE_OWN'

Browse source
This commit is contained in:
Mordred 2017-11-25 00:24:30 +01:00
commit e4ffaedf1f
5 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/servers/Server_Common/Network/PacketDef/Ipcs.h
View file

@ -136,7 +136,9 @@ namespace Packets {
IPCTYPE_UNK_320 = 0x0207, // updated 4.1 IPCTYPE_UNK_320 = 0x0207, // updated 4.1
IPCTYPE_UNK_322 = 0x0209, // updated 4.1 IPCTYPE_UNK_322 = 0x0209, // updated 4.1
ActorGauge = 0x249 ActorGauge = 0x0249,
PerformNote = 0x0252,
}; };
// TODO: Include structures for the individual packet segment types // TODO: Include structures for the individual packet segment types
@ -199,6 +201,7 @@ namespace Packets {
ReqEquipDisplayFlagsChange = 0x014C, // updated 4.1 ?? ReqEquipDisplayFlagsChange = 0x014C, // updated 4.1 ??
PerformNoteHandler = 0x0160,
}; };
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

6
src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -1320,6 +1320,12 @@ struct FFXIVIpcActorGauge : FFXIVIpcBasePacket<ActorGauge>
uint8_t data[15]; // depends on classJobId uint8_t data[15]; // depends on classJobId
}; };
struct FFXIVIpcPerformNote : FFXIVIpcBasePacket<PerformNote>
{
uint8_t data[32];
};
} /* Server */ } /* Server */
} /* Packets */ } /* Packets */
} /* Network */ } /* Network */

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

@ -92,7 +92,9 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive,
setZoneHandler( ClientZoneIpcType::CFRegisterRoulette, "CFRegisterRoulette", &GameConnection::cfRegisterRoulette ); setZoneHandler( ClientZoneIpcType::CFRegisterRoulette, "CFRegisterRoulette", &GameConnection::cfRegisterRoulette );
setZoneHandler( ClientZoneIpcType::CFCommenceHandler, "CFDutyAccepted", &GameConnection::cfDutyAccepted); setZoneHandler( ClientZoneIpcType::CFCommenceHandler, "CFDutyAccepted", &GameConnection::cfDutyAccepted);
setZoneHandler( ClientZoneIpcType::ReqEquipDisplayFlagsChange, "ReqEquipDisplayFlagsChange",&GameConnection::reqEquipDisplayFlagsHandler); setZoneHandler( ClientZoneIpcType::ReqEquipDisplayFlagsChange, "ReqEquipDisplayFlagsChange", &GameConnection::reqEquipDisplayFlagsHandler );
setZoneHandler( ClientZoneIpcType::PerformNoteHandler, "PerformNoteHandler", &GameConnection::performNoteHandler );
setChatHandler( ClientChatIpcType::TellReq, "TellReq", &GameConnection::tellHandler); setChatHandler( ClientChatIpcType::TellReq, "TellReq", &GameConnection::tellHandler);

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

@ -118,6 +118,8 @@ public:
DECLARE_HANDLER( reqEquipDisplayFlagsHandler ); DECLARE_HANDLER( reqEquipDisplayFlagsHandler );
DECLARE_HANDLER( performNoteHandler );
DECLARE_HANDLER( tellHandler ); DECLARE_HANDLER( tellHandler );
}; };

11
src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
View file

@ -598,3 +598,14 @@ void Core::Network::GameConnection::tellHandler( const Packets::GamePacket& inPa
pTargetPlayer->queueChatPacket( tellPacket ); pTargetPlayer->queueChatPacket( tellPacket );
} }
void Core::Network::GameConnection::performNoteHandler( const Packets::GamePacket& inPacket,
Entity::PlayerPtr pPlayer )
{
GamePacketNew< FFXIVIpcPerformNote, ServerZoneIpcType > performPacket( pPlayer->getId() );
uint8_t inVal = inPacket.getValAt< uint8_t >( 0x20 );
memcpy( &performPacket.data().data[0], &inVal, 32 );
pPlayer->sendToInRangeSet( performPacket );
}