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

minor update

Browse source
This commit is contained in:
collett 2024-06-20 17:55:51 +09:00
parent 06d6f4db30
commit 50d6a092d4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ enum ServerZoneIpcType :
Playtime = 0x03DE, // updated 6.58 hotfix 2 Playtime = 0x03DE, // updated 6.58 hotfix 2
Logout = 0x0378, // updated 6.58 hotfix 2 Logout = 0x0378, // updated 6.58 hotfix 2
CFNotify = 0x0279, // updated 6.58 hotfix 2 CFNotify = 0x0279, // updated 6.58 hotfix 2
CFMemberStatus = 0x0079, CFMemberStatus = 0x21F, // updated 6.58 hotfix 2?
CFDutyInfo = 0x2E8, // updated 6.58 hotfix 2? CFDutyInfo = 0x2E8, // updated 6.58 hotfix 2?
CFPlayerInNeed = 0xF07F, CFPlayerInNeed = 0xF07F,
CFPreferredRole = 0x282, // updated 6.58 hotfix 2 CFPreferredRole = 0x282, // updated 6.58 hotfix 2

2
src/world/Actor/Player.cpp
View file

@ -2020,7 +2020,7 @@ void Sapphire::Entity::Player::finishZoning()
} }
} }
void Sapphire::Entity::Player::emote( uint32_t emoteId, uint64_t targetId, bool isSilent, uint32_t rotation ) void Sapphire::Entity::Player::emote( uint32_t emoteId, uint64_t targetId, bool isSilent, uint16_t rotation )
{ {
sendToInRangeSet( makeActorControlTarget( getId(), ActorControlType::Emote, sendToInRangeSet( makeActorControlTarget( getId(), ActorControlType::Emote,
emoteId, 0, isSilent ? 1 : 0, rotation, targetId ) ); emoteId, 0, isSilent ? 1 : 0, rotation, targetId ) );

2
src/world/Actor/Player.h
View file

@ -791,7 +791,7 @@ namespace Sapphire::Entity
/*! 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, bool isSilent, uint32_t rotation = 0 ); void emote( uint32_t emoteId, uint64_t targetId, bool isSilent, uint16_t rotation = 0 );
void emoteInterrupt(); void emoteInterrupt();

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

@ -210,11 +210,11 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
if( commandId == ClientTriggerType::EmoteWithWarp ) if( commandId == ClientTriggerType::EmoteWithWarp )
{ {
player.setPos( packet.data().position ); player.setPos( packet.data().position );
player.setRot( Util::floatFromUInt16Rot( p4 ) ); player.setRot( Util::floatFromUInt16Rot( static_cast< uint16_t >( p4 ) ) );
if( player.hasInRangeActor() ) if( player.hasInRangeActor() )
{ {
auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() ); auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
setpos->data().r16 = p4; setpos->data().r16 = static_cast< uint16_t >( p4 );
setpos->data().waitForLoad = 18; setpos->data().waitForLoad = 18;
setpos->data().x = packet.data().position.x; setpos->data().x = packet.data().position.x;
setpos->data().y = packet.data().position.y; setpos->data().y = packet.data().position.y;
@ -223,7 +223,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
} }
} }
player.emote( emoteId, targetId, isSilent, commandId == ClientTriggerType::EmoteWithWarp ? p4 : 0 ); player.emote( emoteId, targetId, isSilent, commandId == ClientTriggerType::EmoteWithWarp ? static_cast< uint16_t >( p4 ) : 0 );
bool isPersistent = emoteData->emoteMode != 0; bool isPersistent = emoteData->emoteMode != 0;