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

emotes with motion only added #329

Browse source
This commit is contained in:
Mordred 2018-07-08 23:18:01 +02:00
parent 0c805a8f16
commit a5191c2b4f
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/GamePacketNew.h
View file

@ -239,7 +239,7 @@ protected:
// The IPC type itself. // The IPC type itself.
m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType ); m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
m_ipcHdr.timestamp = Util::getTimeSeconds(); m_ipcHdr.timestamp = static_cast< uint32_t >( Util::getTimeSeconds() );
m_segHdr.size = sizeof( T ) + sizeof( FFXIVARR_IPC_HEADER ) + sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ); m_segHdr.size = sizeof( T ) + sizeof( FFXIVARR_IPC_HEADER ) + sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
}; };

5
src/servers/sapphire_zone/Actor/Player.cpp
View file

@ -1650,9 +1650,10 @@ void Core::Entity::Player::finishZoning()
} }
} }
void Core::Entity::Player::emote( uint32_t emoteId, uint64_t targetId ) void Core::Entity::Player::emote( uint32_t emoteId, uint64_t targetId, bool isSilent )
{ {
sendToInRangeSet( boost::make_shared< ActorControlPacket144 >( getId(), ActorControlType::Emote, emoteId, 0, 0, 0, targetId ) ); sendToInRangeSet( boost::make_shared< ActorControlPacket144 >( getId(), ActorControlType::Emote,
emoteId, 0, isSilent ? 1 : 0, 0, targetId ) );
} }
void Core::Entity::Player::teleportQuery( uint16_t aetheryteId ) void Core::Entity::Player::teleportQuery( uint16_t aetheryteId )

2
src/servers/sapphire_zone/Actor/Player.h
View file

@ -507,7 +507,7 @@ public:
/*! return true if the player is marked for zoning */ /*! return true if the player is marked for zoning */
bool isMarkedForZoning() const; bool isMarkedForZoning() const;
void emote( uint32_t emoteId, uint64_t targetId ); void emote( uint32_t emoteId, uint64_t targetId, bool isSilent );
void sendZoneInPackets( uint32_t param1, uint32_t param2, uint32_t param3, uint32_t param4, bool pSetStatus ); void sendZoneInPackets( uint32_t param1, uint32_t param2, uint32_t param3, uint32_t param4, bool pSetStatus );

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

@ -142,8 +142,9 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
{ {
uint64_t targetId = player.getTargetId(); uint64_t targetId = player.getTargetId();
uint32_t emoteId = param11; uint32_t emoteId = param11;
bool isSilent = param2 == 1;
player.emote( emoteId, targetId ); player.emote( emoteId, targetId, isSilent );
break; break;
} }
case ClientTriggerType::PersistantEmoteCancel: // cancel persistant emote case ClientTriggerType::PersistantEmoteCancel: // cancel persistant emote