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

Changed makeActorControl calls aswell

Browse source
This commit is contained in:
Mordred 2019-10-09 18:42:25 +02:00
parent 9bfb9c74f0
commit cfc4a997fe
21 changed files with 121 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/common/housing/CmnDefHousingSignboard.cpp
View file

@ -45,7 +45,7 @@ public:
{ {
case LandPurchaseResult::SUCCESS: case LandPurchaseResult::SUCCESS:
{ {
auto screenMsgPkt = makeActorControl143( player.getId(), ActorControl::DutyQuestScreenMsg, m_id, 0x98 ); auto screenMsgPkt = makeActorControlSelf( player.getId(), ActorControl::DutyQuestScreenMsg, m_id, 0x98 );
player.queuePacket( screenMsgPkt ); player.queuePacket( screenMsgPkt );
player.sendLogMessage( 0x0D16, pTerritory->getTerritoryTypeInfo()->placeName, activeLand.ward + 1, activeLand.plot + 1 ); player.sendLogMessage( 0x0D16, pTerritory->getTerritoryTypeInfo()->placeName, activeLand.ward + 1, activeLand.plot + 1 );

7
src/world/Action/Action.cpp
View file

@ -250,7 +250,8 @@ void Action::Action::start()
} }
// todo: m_recastTimeMs needs to be adjusted for player sks/sps // todo: m_recastTimeMs needs to be adjusted for player sks/sps
auto actionStartPkt = makeActorControl143( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(), m_recastTimeMs / 10 ); auto actionStartPkt = makeActorControlSelf( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(),
m_recastTimeMs / 10 );
player->queuePacket( actionStartPkt ); player->queuePacket( actionStartPkt );
auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >(); auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
@ -299,8 +300,8 @@ void Action::Action::interrupt()
// Note: When cast interrupt from taking too much damage, set the last value to 1. // Note: When cast interrupt from taking too much damage, set the last value to 1.
// This enables the cast interrupt effect. // This enables the cast interrupt effect.
auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastInterrupt, auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastInterrupt,
0x219, 1, m_id, interruptEffect ); 0x219, 1, m_id, interruptEffect );
m_pSource->sendToInRangeSet( control, true ); m_pSource->sendToInRangeSet( control, true );
} }

8
src/world/Action/EventAction.cpp
View file

@ -44,7 +44,7 @@ void Action::EventAction::start()
m_startTime = Common::Util::getTimeMs(); m_startTime = Common::Util::getTimeMs();
auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastStart, 1, m_id, 0x4000004E ); auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastStart, 1, m_id, 0x4000004E );
if( m_pSource->isPlayer() ) if( m_pSource->isPlayer() )
{ {
@ -70,7 +70,7 @@ void Action::EventAction::execute()
if( m_onActionFinishClb ) if( m_onActionFinishClb )
m_onActionFinishClb( *m_pSource->getAsPlayer(), m_eventId, m_additional ); m_onActionFinishClb( *m_pSource->getAsPlayer(), m_eventId, m_additional );
auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastStart, 0, m_id ); auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastStart, 0, m_id );
if( !pEvent->hasPlayedScene() ) if( !pEvent->hasPlayedScene() )
m_pSource->getAsPlayer()->eventFinish( m_eventId, 1 ); m_pSource->getAsPlayer()->eventFinish( m_eventId, 1 );
@ -100,11 +100,11 @@ void Action::EventAction::interrupt()
try try
{ {
auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastInterrupt, 0x219, 0x04, m_id ); auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastInterrupt, 0x219, 0x04, m_id );
if( m_pSource->isPlayer() ) if( m_pSource->isPlayer() )
{ {
auto control1 = makeActorControl143( m_pSource->getId(), ActorControlType::FreeEventPos, m_eventId ); auto control1 = makeActorControlSelf( m_pSource->getId(), ActorControlType::FreeEventPos, m_eventId );
//m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::NoCombat ); //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::NoCombat );
//m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 ); //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 );

10
src/world/Actor/BNpc.cpp
View file

@ -178,7 +178,7 @@ void Sapphire::Entity::BNpc::spawn( PlayerPtr pTarget )
void Sapphire::Entity::BNpc::despawn( PlayerPtr pTarget ) void Sapphire::Entity::BNpc::despawn( PlayerPtr pTarget )
{ {
pTarget->freePlayerSpawnId( getId() ); pTarget->freePlayerSpawnId( getId() );
pTarget->queuePacket( makeActorControl143( m_id, DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) ); pTarget->queuePacket( makeActorControlSelf( m_id, DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
} }
Sapphire::Entity::BNpcState Sapphire::Entity::BNpc::getState() const Sapphire::Entity::BNpcState Sapphire::Entity::BNpc::getState() const
@ -369,8 +369,8 @@ void Sapphire::Entity::BNpc::aggro( Sapphire::Entity::CharaPtr pChara )
setStance( Stance::Active ); setStance( Stance::Active );
m_state = BNpcState::Combat; m_state = BNpcState::Combat;
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleWeapon, 1, 1, 0 ) ); sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleWeapon, 1, 1, 0 ) );
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleAggro, 1, 0, 0 ) ); sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleAggro, 1, 0, 0 ) );
if( pChara->isPlayer() ) if( pChara->isPlayer() )
{ {
@ -388,8 +388,8 @@ void Sapphire::Entity::BNpc::deaggro( Sapphire::Entity::CharaPtr pChara )
if( pChara->isPlayer() ) if( pChara->isPlayer() )
{ {
PlayerPtr tmpPlayer = pChara->getAsPlayer(); PlayerPtr tmpPlayer = pChara->getAsPlayer();
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleWeapon, 0, 1, 1 ) ); sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleWeapon, 0, 1, 1 ) );
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleAggro, 0, 0, 0 ) ); sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleAggro, 0, 0, 0 ) );
tmpPlayer->onMobDeaggro( getAsBNpc() ); tmpPlayer->onMobDeaggro( getAsBNpc() );
} }
} }

18
src/world/Actor/Chara.cpp
View file

@ -291,13 +291,13 @@ void Sapphire::Entity::Chara::die()
// if the actor is a player, the update needs to be send to himself too // if the actor is a player, the update needs to be send to himself too
bool selfNeedsUpdate = isPlayer(); bool selfNeedsUpdate = isPlayer();
FFXIVPacketBasePtr packet = makeActorControl142( m_id, SetStatus, static_cast< uint8_t >( ActorStatus::Dead ) ); FFXIVPacketBasePtr packet = makeActorControl( m_id, SetStatus, static_cast< uint8_t >( ActorStatus::Dead ) );
sendToInRangeSet( packet, selfNeedsUpdate ); sendToInRangeSet( packet, selfNeedsUpdate );
// TODO: not all actor show the death animation when they die, some quest npcs might just despawn // TODO: not all actor show the death animation when they die, some quest npcs might just despawn
// although that might be handled by setting the HP to 1 and doing some script magic // although that might be handled by setting the HP to 1 and doing some script magic
FFXIVPacketBasePtr packet1 = makeActorControl142( m_id, DeathAnimation, 0, 0, 0, 0x20 ); FFXIVPacketBasePtr packet1 = makeActorControl( m_id, DeathAnimation, 0, 0, 0, 0x20 );
sendToInRangeSet( packet1, selfNeedsUpdate ); sendToInRangeSet( packet1, selfNeedsUpdate );
} }
@ -329,7 +329,7 @@ void Sapphire::Entity::Chara::setStance( Stance stance )
{ {
m_currentStance = stance; m_currentStance = stance;
FFXIVPacketBasePtr packet = makeActorControl142( m_id, ToggleWeapon, stance, 0 ); FFXIVPacketBasePtr packet = makeActorControl( m_id, ToggleWeapon, stance, 0 );
sendToInRangeSet( packet ); sendToInRangeSet( packet );
} }
@ -372,7 +372,7 @@ Change the current target and propagate to in range players
void Sapphire::Entity::Chara::changeTarget( uint64_t targetId ) void Sapphire::Entity::Chara::changeTarget( uint64_t targetId )
{ {
setTargetId( targetId ); setTargetId( targetId );
FFXIVPacketBasePtr packet = makeActorControl144( m_id, SetTarget, 0, 0, 0, 0, targetId ); FFXIVPacketBasePtr packet = makeActorControlTarget( m_id, SetTarget, 0, 0, 0, 0, targetId );
sendToInRangeSet( packet ); sendToInRangeSet( packet );
} }
@ -602,7 +602,7 @@ void Sapphire::Entity::Chara::removeStatusEffect( uint8_t effectSlotId )
auto pEffect = pEffectIt->second; auto pEffect = pEffectIt->second;
pEffect->removeStatus(); pEffect->removeStatus();
sendToInRangeSet( makeActorControl142( getId(), StatusEffectLose, pEffect->getId() ), isPlayer() ); sendToInRangeSet( makeActorControl( getId(), StatusEffectLose, pEffect->getId() ), isPlayer() );
m_statusEffectMap.erase( effectSlotId ); m_statusEffectMap.erase( effectSlotId );
@ -718,15 +718,15 @@ void Sapphire::Entity::Chara::updateStatusEffects()
if( thisTickDmg != 0 ) if( thisTickDmg != 0 )
{ {
takeDamage( thisTickDmg ); takeDamage( thisTickDmg );
sendToInRangeSet( makeActorControl142( getId(), HPFloatingText, 0, sendToInRangeSet( makeActorControl( getId(), HPFloatingText, 0,
static_cast< uint8_t >( ActionEffectType::Damage ), thisTickDmg ) ); static_cast< uint8_t >( ActionEffectType::Damage ), thisTickDmg ) );
} }
if( thisTickHeal != 0 ) if( thisTickHeal != 0 )
{ {
heal( thisTickDmg ); heal( thisTickDmg );
sendToInRangeSet( makeActorControl142( getId(), HPFloatingText, 0, sendToInRangeSet( makeActorControl( getId(), HPFloatingText, 0,
static_cast< uint8_t >( ActionEffectType::Heal ), thisTickHeal ) ); static_cast< uint8_t >( ActionEffectType::Heal ), thisTickHeal ) );
} }
} }

4
src/world/Actor/EventObject.cpp
View file

@ -80,7 +80,7 @@ void Sapphire::Entity::EventObject::setState( uint8_t state )
for( const auto& player : m_inRangePlayers ) for( const auto& player : m_inRangePlayers )
{ {
player->queuePacket( makeActorControl142( getId(), DirectorEObjMod, state ) ); player->queuePacket( makeActorControl( getId(), DirectorEObjMod, state ) );
} }
} }
@ -88,7 +88,7 @@ void Sapphire::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t an
{ {
for( const auto& player : m_inRangePlayers ) for( const auto& player : m_inRangePlayers )
{ {
player->queuePacket( makeActorControl142( getId(), EObjAnimation, flag, animationFlag ) ); player->queuePacket( makeActorControl( getId(), EObjAnimation, flag, animationFlag ) );
} }
} }

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

@ -373,19 +373,19 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
if( type == 1 ) // teleport if( type == 1 ) // teleport
{ {
prepareZoning( data->territory, true, 1, 112 ); // TODO: Really? prepareZoning( data->territory, true, 1, 112 ); // TODO: Really?
sendToInRangeSet( makeActorControl142( getId(), ActorDespawnEffect, 0x04 ) ); sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x04 ) );
setZoningType( Common::ZoneingType::Teleport ); setZoningType( Common::ZoneingType::Teleport );
} }
else if( type == 2 ) // aethernet else if( type == 2 ) // aethernet
{ {
prepareZoning( data->territory, true, 1, 112 ); prepareZoning( data->territory, true, 1, 112 );
sendToInRangeSet( makeActorControl142( getId(), ActorDespawnEffect, 0x04 ) ); sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x04 ) );
setZoningType( Common::ZoneingType::Teleport ); setZoningType( Common::ZoneingType::Teleport );
} }
else if( type == 3 ) // return else if( type == 3 ) // return
{ {
prepareZoning( data->territory, true, 1, 111 ); prepareZoning( data->territory, true, 1, 111 );
sendToInRangeSet( makeActorControl142( getId(), ActorDespawnEffect, 0x03 ) ); sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x03 ) );
setZoningType( Common::ZoneingType::Return ); setZoningType( Common::ZoneingType::Return );
} }
@ -565,7 +565,7 @@ void Sapphire::Entity::Player::registerAetheryte( uint8_t aetheryteId )
Util::valueToFlagByteIndexValue( aetheryteId, value, index ); Util::valueToFlagByteIndexValue( aetheryteId, value, index );
m_aetheryte[ index ] |= value; m_aetheryte[ index ] |= value;
queuePacket( makeActorControl143( getId(), LearnTeleport, aetheryteId, 1 ) ); queuePacket( makeActorControlSelf( getId(), LearnTeleport, aetheryteId, 1 ) );
} }
bool Sapphire::Entity::Player::isAetheryteRegistered( uint8_t aetheryteId ) const bool Sapphire::Entity::Player::isAetheryteRegistered( uint8_t aetheryteId ) const
@ -656,7 +656,7 @@ void Sapphire::Entity::Player::learnAction( uint16_t actionId )
m_unlocks[ index ] |= value; m_unlocks[ index ] |= value;
queuePacket( makeActorControl143( getId(), ToggleActionUnlock, actionId, 1 ) ); queuePacket( makeActorControlSelf( getId(), ToggleActionUnlock, actionId, 1 ) );
} }
void Sapphire::Entity::Player::learnSong( uint8_t songId, uint32_t itemId ) void Sapphire::Entity::Player::learnSong( uint8_t songId, uint32_t itemId )
@ -667,7 +667,7 @@ void Sapphire::Entity::Player::learnSong( uint8_t songId, uint32_t itemId )
m_orchestrion[ index ] |= value; m_orchestrion[ index ] |= value;
queuePacket( makeActorControl143( getId(), ToggleOrchestrionUnlock, songId, 1, itemId ) ); queuePacket( makeActorControlSelf( getId(), ToggleOrchestrionUnlock, songId, 1, itemId ) );
} }
bool Sapphire::Entity::Player::isActionLearned( uint8_t actionId ) const bool Sapphire::Entity::Player::isActionLearned( uint8_t actionId ) const
@ -691,11 +691,11 @@ void Sapphire::Entity::Player::gainExp( uint32_t amount )
uint32_t neededExpToLevelplus1 = pExdData->get< Sapphire::Data::ParamGrow >( level + 1 )->expToNext; uint32_t neededExpToLevelplus1 = pExdData->get< Sapphire::Data::ParamGrow >( level + 1 )->expToNext;
queuePacket( makeActorControl143( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) ); queuePacket( makeActorControlSelf( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) );
if( level >= Common::MAX_PLAYER_LEVEL ) // temporary fix for leveling over levelcap if( level >= Common::MAX_PLAYER_LEVEL ) // temporary fix for leveling over levelcap
{ {
queuePacket( makeActorControl143( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) ); queuePacket( makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );
return; return;
} }
@ -707,13 +707,13 @@ void Sapphire::Entity::Player::gainExp( uint32_t amount )
( currentExp + amount - neededExpToLevel ); ( currentExp + amount - neededExpToLevel );
setExp( amount ); setExp( amount );
gainLevel(); gainLevel();
queuePacket( makeActorControl143( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) ); queuePacket( makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );
} }
else else
{ {
queuePacket( queuePacket(
makeActorControl143( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), currentExp + amount ) ); makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), currentExp + amount ) );
setExp( currentExp + amount ); setExp( currentExp + amount );
} }
@ -742,8 +742,8 @@ void Sapphire::Entity::Player::gainLevel()
effectListPacket->data().max_mp = getMaxMp(); effectListPacket->data().max_mp = getMaxMp();
sendToInRangeSet( effectListPacket, true ); sendToInRangeSet( effectListPacket, true );
sendToInRangeSet( makeActorControl142( getId(), LevelUpEffect, static_cast< uint8_t >( getClass() ), sendToInRangeSet( makeActorControl( getId(), LevelUpEffect, static_cast< uint8_t >( getClass() ),
getLevel(), getLevel() - 1 ), true ); getLevel(), getLevel() - 1 ), true );
auto classInfoPacket = makeZonePacket< FFXIVIpcUpdateClassInfo >( getId() ); auto classInfoPacket = makeZonePacket< FFXIVIpcUpdateClassInfo >( getId() );
classInfoPacket->data().classId = static_cast< uint8_t > ( getClass() ); classInfoPacket->data().classId = static_cast< uint8_t > ( getClass() );
@ -824,7 +824,7 @@ void Sapphire::Entity::Player::setClassJob( Common::ClassJob classJob )
classInfoPacket->data().syncedLevel = getLevel(); classInfoPacket->data().syncedLevel = getLevel();
queuePacket( classInfoPacket ); queuePacket( classInfoPacket );
sendToInRangeSet( makeActorControl142( getId(), ClassJobChange, 0x04 ), true ); sendToInRangeSet( makeActorControl( getId(), ClassJobChange, 0x04 ), true );
sendStatusUpdate(); sendStatusUpdate();
} }
@ -920,7 +920,7 @@ void Sapphire::Entity::Player::despawn( Entity::PlayerPtr pTarget )
pPlayer->freePlayerSpawnId( getId() ); pPlayer->freePlayerSpawnId( getId() );
pPlayer->queuePacket( makeActorControl143( getId(), DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) ); pPlayer->queuePacket( makeActorControlSelf( getId(), DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
} }
Sapphire::Entity::ActorPtr Sapphire::Entity::Player::lookupTargetById( uint64_t targetId ) Sapphire::Entity::ActorPtr Sapphire::Entity::Player::lookupTargetById( uint64_t targetId )
@ -1016,8 +1016,8 @@ void Sapphire::Entity::Player::setStateFlag( Common::PlayerStateFlag flag )
auto newOnlineStatus = getOnlineStatus(); auto newOnlineStatus = getOnlineStatus();
if( prevOnlineStatus != newOnlineStatus ) if( prevOnlineStatus != newOnlineStatus )
sendToInRangeSet( makeActorControl142( getId(), SetStatusIcon, sendToInRangeSet( makeActorControl( getId(), SetStatusIcon,
static_cast< uint8_t >( getOnlineStatus() ) ), true ); static_cast< uint8_t >( getOnlineStatus() ) ), true );
} }
@ -1053,8 +1053,7 @@ void Sapphire::Entity::Player::unsetStateFlag( Common::PlayerStateFlag flag )
auto newOnlineStatus = getOnlineStatus(); auto newOnlineStatus = getOnlineStatus();
if( prevOnlineStatus != newOnlineStatus ) if( prevOnlineStatus != newOnlineStatus )
sendToInRangeSet( makeActorControl142( getId(), SetStatusIcon, static_cast< uint8_t >( getOnlineStatus() ) ), sendToInRangeSet( makeActorControl( getId(), SetStatusIcon, static_cast< uint8_t >( getOnlineStatus() ) ), true );
true );
} }
void Sapphire::Entity::Player::update( uint64_t tickCount ) void Sapphire::Entity::Player::update( uint64_t tickCount )
@ -1169,7 +1168,7 @@ void Sapphire::Entity::Player::setHomepoint( uint8_t aetheryteId )
{ {
m_homePoint = aetheryteId; m_homePoint = aetheryteId;
queuePacket( makeActorControl143( getId(), SetHomepoint, aetheryteId ) ); queuePacket( makeActorControlSelf( getId(), SetHomepoint, aetheryteId ) );
} }
/*! get homepoint */ /*! get homepoint */
@ -1347,7 +1346,7 @@ void Sapphire::Entity::Player::sendDebug( const std::string& message ) //Grey Te
void Sapphire::Entity::Player::sendLogMessage( uint32_t messageId, uint32_t param2, uint32_t param3, void Sapphire::Entity::Player::sendLogMessage( uint32_t messageId, uint32_t param2, uint32_t param3,
uint32_t param4, uint32_t param5, uint32_t param6 ) uint32_t param4, uint32_t param5, uint32_t param6 )
{ {
queuePacket( makeActorControl144( getId(), ActorControlType::LogMsg, messageId, param2, param3, param4, param5, param6 ) ); queuePacket( makeActorControlTarget( getId(), ActorControlType::LogMsg, messageId, param2, param3, param4, param5, param6 ) );
} }
void Sapphire::Entity::Player::updateHowtosSeen( uint32_t howToId ) void Sapphire::Entity::Player::updateHowtosSeen( uint32_t howToId )
@ -1429,14 +1428,14 @@ void Sapphire::Entity::Player::sendHateList()
void Sapphire::Entity::Player::onMobAggro( BNpcPtr pBNpc ) void Sapphire::Entity::Player::onMobAggro( BNpcPtr pBNpc )
{ {
hateListAdd( pBNpc ); hateListAdd( pBNpc );
queuePacket( makeActorControl142( getId(), ToggleAggro, 1 ) ); queuePacket( makeActorControl( getId(), ToggleAggro, 1 ) );
} }
void Sapphire::Entity::Player::onMobDeaggro( BNpcPtr pBNpc ) void Sapphire::Entity::Player::onMobDeaggro( BNpcPtr pBNpc )
{ {
hateListRemove( pBNpc ); hateListRemove( pBNpc );
if( m_actorIdTohateSlotMap.empty() ) if( m_actorIdTohateSlotMap.empty() )
queuePacket( makeActorControl142( getId(), ToggleAggro ) ); queuePacket( makeActorControl( getId(), ToggleAggro ) );
} }
bool Sapphire::Entity::Player::isLogin() const bool Sapphire::Entity::Player::isLogin() const
@ -1484,7 +1483,7 @@ void Sapphire::Entity::Player::setTitle( uint16_t titleId )
m_activeTitle = titleId; m_activeTitle = titleId;
sendToInRangeSet( makeActorControl142( getId(), SetTitle, titleId ), true ); sendToInRangeSet( makeActorControl( getId(), SetTitle, titleId ), true );
} }
void Sapphire::Entity::Player::setEquipDisplayFlags( uint8_t state ) void Sapphire::Entity::Player::setEquipDisplayFlags( uint8_t state )
@ -1503,9 +1502,9 @@ uint8_t Sapphire::Entity::Player::getEquipDisplayFlags() const
void Sapphire::Entity::Player::mount( uint32_t id ) void Sapphire::Entity::Player::mount( uint32_t id )
{ {
m_mount = id; m_mount = id;
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::SetStatus, sendToInRangeSet( makeActorControl( getId(), ActorControlType::SetStatus,
static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true ); static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true );
sendToInRangeSet( makeActorControl143( getId(), 0x39e, 12 ), true ); //? sendToInRangeSet( makeActorControlSelf( getId(), 0x39e, 12 ), true ); //?
auto mountPacket = makeZonePacket< FFXIVIpcMount >( getId() ); auto mountPacket = makeZonePacket< FFXIVIpcMount >( getId() );
mountPacket->data().id = id; mountPacket->data().id = id;
@ -1514,9 +1513,9 @@ void Sapphire::Entity::Player::mount( uint32_t id )
void Sapphire::Entity::Player::dismount() void Sapphire::Entity::Player::dismount()
{ {
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::SetStatus, sendToInRangeSet( makeActorControl( getId(), ActorControlType::SetStatus,
static_cast< uint8_t >( Common::ActorStatus::Idle ) ), true ); static_cast< uint8_t >( Common::ActorStatus::Idle ) ), true );
sendToInRangeSet( makeActorControl143( getId(), ActorControlType::Dismount, 1 ), true ); sendToInRangeSet( makeActorControlSelf( getId(), ActorControlType::Dismount, 1 ), true );
m_mount = 0; m_mount = 0;
} }
@ -1530,7 +1529,7 @@ void Sapphire::Entity::Player::spawnCompanion( uint16_t id )
return; return;
m_companionId = id; m_companionId = id;
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleCompanion, id ), true ); sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleCompanion, id ), true );
} }
uint16_t Sapphire::Entity::Player::getCurrentCompanion() const uint16_t Sapphire::Entity::Player::getCurrentCompanion() const
@ -1691,7 +1690,7 @@ void Sapphire::Entity::Player::sendZonePackets()
if( isLogin() ) if( isLogin() )
{ {
queuePacket( makeActorControl143( getId(), SetCharaGearParamUI, m_equipDisplayFlags, 1 ) ); queuePacket( makeActorControlSelf( getId(), SetCharaGearParamUI, m_equipDisplayFlags, 1 ) );
} }
// set flags, will be reset automatically by zoning ( only on client side though ) // set flags, will be reset automatically by zoning ( only on client side though )
@ -1796,8 +1795,8 @@ void
Sapphire::Entity::Player::sendZoneInPackets( uint32_t param1, uint32_t param2 = 0, uint32_t param3 = 0, uint32_t param4 = 0, Sapphire::Entity::Player::sendZoneInPackets( uint32_t param1, uint32_t param2 = 0, uint32_t param3 = 0, uint32_t param4 = 0,
bool shouldSetStatus = false ) bool shouldSetStatus = false )
{ {
auto zoneInPacket = makeActorControl143( getId(), ZoneIn, param1, param2, param3, param4 ); auto zoneInPacket = makeActorControlSelf( getId(), ZoneIn, param1, param2, param3, param4 );
auto SetStatusPacket = makeActorControl142( getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) ); auto SetStatusPacket = makeActorControl( getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
if( !getGmInvis() ) if( !getGmInvis() )
sendToInRangeSet( zoneInPacket ); sendToInRangeSet( zoneInPacket );
@ -1845,13 +1844,13 @@ void Sapphire::Entity::Player::finishZoning()
void Sapphire::Entity::Player::emote( uint32_t emoteId, uint64_t targetId, bool isSilent ) void Sapphire::Entity::Player::emote( uint32_t emoteId, uint64_t targetId, bool isSilent )
{ {
sendToInRangeSet( makeActorControl144( getId(), ActorControlType::Emote, sendToInRangeSet( makeActorControlTarget( getId(), ActorControlType::Emote,
emoteId, 0, isSilent ? 1 : 0, 0, targetId ) ); emoteId, 0, isSilent ? 1 : 0, 0, targetId ) );
} }
void Sapphire::Entity::Player::emoteInterrupt() void Sapphire::Entity::Player::emoteInterrupt()
{ {
sendToInRangeSet( makeActorControl142( getId(), ActorControlType::EmoteInterrupt ) ); sendToInRangeSet( makeActorControl( getId(), ActorControlType::EmoteInterrupt ) );
} }
void Sapphire::Entity::Player::teleportQuery( uint16_t aetheryteId ) void Sapphire::Entity::Player::teleportQuery( uint16_t aetheryteId )
@ -1875,7 +1874,7 @@ void Sapphire::Entity::Player::teleportQuery( uint16_t aetheryteId )
bool insufficientGil = getCurrency( Common::CurrencyType::Gil ) < cost; bool insufficientGil = getCurrency( Common::CurrencyType::Gil ) < cost;
// TODO: figure out what param1 really does // TODO: figure out what param1 really does
queuePacket( makeActorControl143( getId(), TeleportStart, insufficientGil ? 2 : 0, aetheryteId ) ); queuePacket( makeActorControlSelf( getId(), TeleportStart, insufficientGil ? 2 : 0, aetheryteId ) );
if( !insufficientGil ) if( !insufficientGil )
{ {
@ -2083,7 +2082,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
if( note1->bNpcName == id && logEntry.entries[ i - 1 ][ x ] < note->count[ x ] ) if( note1->bNpcName == id && logEntry.entries[ i - 1 ][ x ] < note->count[ x ] )
{ {
logEntry.entries[ i - 1 ][ x ]++; logEntry.entries[ i - 1 ][ x ]++;
queuePacket( makeActorControl143( getId(), HuntingLogEntryUpdate, monsterNoteId, x, logEntry.entries[ i - 1 ][ x ] ) ); queuePacket( makeActorControlSelf( getId(), HuntingLogEntryUpdate, monsterNoteId, x, logEntry.entries[ i - 1 ][ x ] ) );
logChanged = true; logChanged = true;
sectionChanged = true; sectionChanged = true;
} }
@ -2092,7 +2091,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
} }
if( logChanged && sectionComplete && sectionChanged ) if( logChanged && sectionComplete && sectionChanged )
{ {
queuePacket( makeActorControl143( getId(), HuntingLogSectionFinish, monsterNoteId, i, 0 ) ); queuePacket( makeActorControlSelf( getId(), HuntingLogSectionFinish, monsterNoteId, i, 0 ) );
gainExp( note->reward ); gainExp( note->reward );
} }
if( !sectionComplete ) if( !sectionComplete )
@ -2102,13 +2101,13 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
} }
if( logChanged && allSectionsComplete ) if( logChanged && allSectionsComplete )
{ {
queuePacket( makeActorControl143( getId(), HuntingLogRankFinish, 4, 0, 0 ) ); queuePacket( makeActorControlSelf( getId(), HuntingLogRankFinish, 4, 0, 0 ) );
gainExp( rankRewards[ logEntry.rank ] ); gainExp( rankRewards[ logEntry.rank ] );
if( logEntry.rank < 4 ) if( logEntry.rank < 4 )
{ {
logEntry.rank++; logEntry.rank++;
memset( logEntry.entries, 0, 40 ); memset( logEntry.entries, 0, 40 );
queuePacket( makeActorControl143( getId(), HuntingLogRankUnlock, queuePacket( makeActorControlSelf( getId(), HuntingLogRankUnlock,
static_cast< uint8_t >( getClass() ), logEntry.rank + 1, 0 ) ); static_cast< uint8_t >( getClass() ), logEntry.rank + 1, 0 ) );
} }
} }

8
src/world/Actor/PlayerInventory.cpp
View file

@ -109,7 +109,7 @@ void Sapphire::Entity::Player::initInventory()
void Sapphire::Entity::Player::sendItemLevel() void Sapphire::Entity::Player::sendItemLevel()
{ {
queuePacket( makeActorControl142( getId(), SetItemLevel, getItemLevel(), 0 ) ); queuePacket( makeActorControl( getId(), SetItemLevel, getItemLevel(), 0 ) );
} }
void Sapphire::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass ) void Sapphire::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass )
@ -379,7 +379,7 @@ void Sapphire::Entity::Player::addCrystal( Common::CrystalType type, uint32_t am
Common::InventoryType::Crystal, Common::InventoryType::Crystal,
*currItem ); *currItem );
queuePacket( invUpdate ); queuePacket( invUpdate );
queuePacket( makeActorControl143( getId(), ItemObtainIcon, static_cast< uint8_t >( type ) + 1, amount ) ); queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, static_cast< uint8_t >( type ) + 1, amount ) );
} }
void Sapphire::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t amount ) void Sapphire::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t amount )
@ -603,7 +603,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
// return existing stack if we have no overflow - items fit into a preexisting stack // return existing stack if we have no overflow - items fit into a preexisting stack
if( quantity == 0 ) if( quantity == 0 )
{ {
queuePacket( makeActorControl143( getId(), ItemObtainIcon, catalogId, originalQuantity ) ); queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
return item; return item;
} }
@ -635,7 +635,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
*item ); *item );
queuePacket( invUpdate ); queuePacket( invUpdate );
queuePacket( makeActorControl143( getId(), ItemObtainIcon, catalogId, originalQuantity ) ); queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
} }
return item; return item;

4
src/world/Event/Director.cpp
View file

@ -44,7 +44,7 @@ uint8_t Sapphire::Event::Director::getSequence() const
void Sapphire::Event::Director::sendDirectorClear( Sapphire::Entity::Player& player ) const void Sapphire::Event::Director::sendDirectorClear( Sapphire::Entity::Player& player ) const
{ {
player.queuePacket( makeActorControl143( player.getId(), DirectorClear, m_directorId ) ); player.queuePacket( makeActorControlSelf( player.getId(), DirectorClear, m_directorId ) );
} }
void Sapphire::Event::Director::sendDirectorVars( Sapphire::Entity::Player& player ) const void Sapphire::Event::Director::sendDirectorVars( Sapphire::Entity::Player& player ) const
@ -60,7 +60,7 @@ void Sapphire::Event::Director::sendDirectorVars( Sapphire::Entity::Player& play
void Sapphire::Event::Director::sendDirectorInit( Sapphire::Entity::Player& player ) const void Sapphire::Event::Director::sendDirectorInit( Sapphire::Entity::Player& player ) const
{ {
Logger::debug( "DirectorID#{}, QuestBattleID#{}", m_directorId, m_contentId ); Logger::debug( "DirectorID#{}, QuestBattleID#{}", m_directorId, m_contentId );
player.queuePacket( makeActorControl143( player.getId(), DirectorInit, m_directorId, m_contentId ) ); player.queuePacket( makeActorControlSelf( player.getId(), DirectorInit, m_directorId, m_contentId ) );
} }
Sapphire::Event::Director::DirectorType Sapphire::Event::Director::getType() const Sapphire::Event::Director::DirectorType Sapphire::Event::Director::getType() const

21
src/world/Manager/HousingMgr.cpp
View file

@ -427,7 +427,7 @@ bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& playe
// TODO: actually use permissions here for FC houses // TODO: actually use permissions here for FC houses
if( !hasPermission( player, *pLand, 0 ) ) if( !hasPermission( player, *pLand, 0 ) )
{ {
auto msgPkt = makeActorControl143( player.getId(), ActorControl::LogMsg, 3304, 0 ); auto msgPkt = makeActorControlSelf( player.getId(), ActorControl::LogMsg, 3304, 0 );
player.queuePacket( msgPkt ); player.queuePacket( msgPkt );
return false; return false;
} }
@ -436,7 +436,7 @@ bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& playe
// TODO: additionally check for yard items // TODO: additionally check for yard items
if( pLand->getHouse() ) if( pLand->getHouse() )
{ {
auto msgPkt = makeActorControl143( player.getId(), ActorControl::LogMsg, 3315, 0 ); auto msgPkt = makeActorControlSelf( player.getId(), ActorControl::LogMsg, 3315, 0 );
player.queuePacket( msgPkt ); player.queuePacket( msgPkt );
return false; return false;
} }
@ -453,8 +453,8 @@ bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& playe
player.sendLandFlagsSlot( LandFlagsSlot::Private ); player.sendLandFlagsSlot( LandFlagsSlot::Private );
auto screenMsgPkt2 = makeActorControl143( player.getId(), ActorControl::LogMsg, 3351, 0x1AA, auto screenMsgPkt2 = makeActorControlSelf( player.getId(), ActorControl::LogMsg, 3351, 0x1AA,
pLand->getLandIdent().wardNum + 1, plot + 1 ); pLand->getLandIdent().wardNum + 1, plot + 1 );
player.queuePacket( screenMsgPkt2 ); player.queuePacket( screenMsgPkt2 );
pHousing->sendLandUpdate( plot ); pHousing->sendLandUpdate( plot );
@ -692,7 +692,7 @@ void Sapphire::World::Manager::HousingMgr::buildPresetEstate( Entity::Player& pl
pLand->setLandType( LandType::Private ); pLand->setLandType( LandType::Private );
hZone->sendLandUpdate( plotNum ); hZone->sendLandUpdate( plotNum );
auto pSuccessBuildingPacket = makeActorControl142( player.getId(), ActorControl::BuildPresetResponse, plotNum ); auto pSuccessBuildingPacket = makeActorControl( player.getId(), ActorControl::BuildPresetResponse, plotNum );
player.queuePacket( pSuccessBuildingPacket ); player.queuePacket( pSuccessBuildingPacket );
@ -1034,7 +1034,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity
status = placeInteriorItem( player, item ); status = placeInteriorItem( player, item );
if( status ) if( status )
player.queuePacket( Server::makeActorControl143( player.getId(), 0x3f3 ) ); player.queuePacket( Server::makeActorControlSelf( player.getId(), 0x3f3 ) );
else else
player.sendUrgent( "An internal error occurred when placing the item." ); player.sendUrgent( "An internal error occurred when placing the item." );
} }
@ -1298,7 +1298,8 @@ bool Sapphire::World::Manager::HousingMgr::moveInternalItem( Entity::Player& pla
// send confirmation to player // send confirmation to player
uint32_t param1 = ( ident.landId << 16 ) | containerId; uint32_t param1 = ( ident.landId << 16 ) | containerId;
player.queuePacket( Server::makeActorControl143( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slotIdx ) ); player.queuePacket(
Server::makeActorControlSelf( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slotIdx ) );
return true; return true;
} }
@ -1333,7 +1334,7 @@ bool Sapphire::World::Manager::HousingMgr::moveExternalItem( Entity::Player& pla
terri.updateYardObjectPos( player, slot, ident.landId, *item ); terri.updateYardObjectPos( player, slot, ident.landId, *item );
uint32_t param1 = ( ident.landId << 16 ) | InventoryType::HousingExteriorPlacedItems; uint32_t param1 = ( ident.landId << 16 ) | InventoryType::HousingExteriorPlacedItems;
player.queuePacket( Server::makeActorControl143( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slot ) ); player.queuePacket( Server::makeActorControlSelf( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slot ) );
return true; return true;
@ -1567,7 +1568,7 @@ void Sapphire::World::Manager::HousingMgr::reqEstateExteriorRemodel( Sapphire::E
invMgr->sendInventoryContainer( player, it->second ); invMgr->sendInventoryContainer( player, it->second );
auto pkt = Server::makeActorControl143( player.getId(), Network::ActorControl::ShowEstateExternalAppearanceUI, plot ); auto pkt = Server::makeActorControlSelf( player.getId(), Network::ActorControl::ShowEstateExternalAppearanceUI, plot );
player.queuePacket( pkt ); player.queuePacket( pkt );
} }
@ -1597,7 +1598,7 @@ void Sapphire::World::Manager::HousingMgr::reqEstateInteriorRemodel( Sapphire::E
invMgr->sendInventoryContainer( player, it->second ); invMgr->sendInventoryContainer( player, it->second );
auto pkt = Server::makeActorControl143( player.getId(), Network::ActorControl::ShowEstateInternalAppearanceUI ); auto pkt = Server::makeActorControlSelf( player.getId(), Network::ActorControl::ShowEstateInternalAppearanceUI );
player.queuePacket( pkt ); player.queuePacket( pkt );
} }

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

@ -52,7 +52,7 @@ void examineHandler( Sapphire::FrameworkPtr pFw, Sapphire::Entity::Player& playe
{ {
if( pTarget->isActingAsGm() || pTarget->getZoneId() != player.getZoneId() ) if( pTarget->isActingAsGm() || pTarget->getZoneId() != player.getZoneId() )
{ {
player.queuePacket( makeActorControl142( player.getId(), ActorControlType::ExamineError ) ); player.queuePacket( makeActorControl( player.getId(), ActorControlType::ExamineError ) );
} }
else else
{ {
@ -95,7 +95,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
player.setAutoattack( false ); player.setAutoattack( false );
} }
player.sendToInRangeSet( makeActorControl142( player.getId(), 0, param11, 1 ) ); player.sendToInRangeSet( makeActorControl( player.getId(), 0, param11, 1 ) );
break; break;
} }
@ -109,7 +109,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
else else
player.setAutoattack( false ); player.setAutoattack( false );
player.sendToInRangeSet( makeActorControl142( player.getId(), 1, param11, 1 ) ); player.sendToInRangeSet( makeActorControl( player.getId(), 1, param11, 1 ) );
break; break;
} }
@ -207,9 +207,9 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
player.setPersistentEmote( emoteData->emoteMode ); player.setPersistentEmote( emoteData->emoteMode );
player.setStatus( Common::ActorStatus::EmoteMode ); player.setStatus( Common::ActorStatus::EmoteMode );
player.sendToInRangeSet( makeActorControl142( player.getId(), ActorControlType::SetStatus, player.sendToInRangeSet( makeActorControl( player.getId(), ActorControlType::SetStatus,
static_cast< uint8_t >( Common::ActorStatus::EmoteMode ), static_cast< uint8_t >( Common::ActorStatus::EmoteMode ),
emoteData->hasCancelEmote ? 1 : 0 ), true ); emoteData->hasCancelEmote ? 1 : 0 ), true );
} }
if( emoteData->drawsWeapon ) if( emoteData->drawsWeapon )
@ -229,8 +229,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
player.setPersistentEmote( 0 ); player.setPersistentEmote( 0 );
player.emoteInterrupt(); player.emoteInterrupt();
player.setStatus( Common::ActorStatus::Idle ); player.setStatus( Common::ActorStatus::Idle );
auto pSetStatusPacket = makeActorControl142( player.getId(), SetStatus, auto pSetStatusPacket = makeActorControl( player.getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
static_cast< uint8_t >( Common::ActorStatus::Idle ) );
player.sendToInRangeSet( pSetStatusPacket ); player.sendToInRangeSet( pSetStatusPacket );
break; break;
} }
@ -238,14 +237,14 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
case ClientTriggerType::PoseReapply: // reapply pose case ClientTriggerType::PoseReapply: // reapply pose
{ {
player.setPose( param12 ); player.setPose( param12 );
auto pSetStatusPacket = makeActorControl142( player.getId(), SetPose, param11, param12 ); auto pSetStatusPacket = makeActorControl( player.getId(), SetPose, param11, param12 );
player.sendToInRangeSet( pSetStatusPacket, true ); player.sendToInRangeSet( pSetStatusPacket, true );
break; break;
} }
case ClientTriggerType::PoseCancel: // cancel pose case ClientTriggerType::PoseCancel: // cancel pose
{ {
player.setPose( param12 ); player.setPose( param12 );
auto pSetStatusPacket = makeActorControl142( player.getId(), SetPose, param11, param12 ); auto pSetStatusPacket = makeActorControl( player.getId(), SetPose, param11, param12 );
player.sendToInRangeSet( pSetStatusPacket, true ); player.sendToInRangeSet( pSetStatusPacket, true );
break; break;
} }
@ -320,7 +319,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
player.setActiveLand( param11, hZone->getWardNum() ); player.setActiveLand( param11, hZone->getWardNum() );
auto pShowBuildPresetUIPacket = makeActorControl142( player.getId(), ShowBuildPresetUI, param11 ); auto pShowBuildPresetUIPacket = makeActorControl( player.getId(), ShowBuildPresetUI, param11 );
player.queuePacket( pShowBuildPresetUIPacket ); player.queuePacket( pShowBuildPresetUIPacket );
break; break;
@ -404,7 +403,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
uint8_t ward = ( param12 >> 16 ) & 0xFF; uint8_t ward = ( param12 >> 16 ) & 0xFF;
uint8_t plot = ( param12 & 0xFF ); uint8_t plot = ( param12 & 0xFF );
auto pShowHousingItemUIPacket = makeActorControl142( player.getId(), ShowHousingItemUI, 0, plot ); auto pShowHousingItemUIPacket = makeActorControl( player.getId(), ShowHousingItemUI, 0, plot );
player.queuePacket( pShowHousingItemUIPacket ); player.queuePacket( pShowHousingItemUIPacket );

12
src/world/Network/Handlers/GMCommandHandlers.cpp
View file

@ -228,7 +228,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
} }
case GmCommand::Speed: case GmCommand::Speed:
{ {
targetPlayer->queuePacket( makeActorControl143( player.getId(), Flee, param1 ) ); targetPlayer->queuePacket( makeActorControlSelf( player.getId(), Flee, param1 ) );
player.sendNotice( "Speed for {0} was set to {1}", targetPlayer->getName(), param1 ); player.sendNotice( "Speed for {0} was set to {1}", targetPlayer->getName(), param1 );
break; break;
} }
@ -267,8 +267,8 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
strcpy( searchInfoPacket->data().searchMessage, targetPlayer->getSearchMessage() ); strcpy( searchInfoPacket->data().searchMessage, targetPlayer->getSearchMessage() );
targetPlayer->queuePacket( searchInfoPacket ); targetPlayer->queuePacket( searchInfoPacket );
targetPlayer->sendToInRangeSet( makeActorControl142( player.getId(), SetStatusIcon, targetPlayer->sendToInRangeSet( makeActorControl( player.getId(), SetStatusIcon,
static_cast< uint8_t >( player.getOnlineStatus() ) ), static_cast< uint8_t >( player.getOnlineStatus() ) ),
true ); true );
player.sendNotice( "Icon for {0} was set to {1}", targetPlayer->getName(), param1 ); player.sendNotice( "Icon for {0} was set to {1}", targetPlayer->getName(), param1 );
break; break;
@ -643,9 +643,9 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
targetPlayer->sendZoneInPackets( 0x01, 0x01, 0, 113, true ); targetPlayer->sendZoneInPackets( 0x01, 0x01, 0, 113, true );
targetPlayer->sendToInRangeSet( makeActorControl143( player.getId(), ZoneIn, 0x01, 0x01, 0, 113 ), true ); targetPlayer->sendToInRangeSet( makeActorControlSelf( player.getId(), ZoneIn, 0x01, 0x01, 0, 113 ), true );
targetPlayer->sendToInRangeSet( makeActorControl142( player.getId(), SetStatus, targetPlayer->sendToInRangeSet( makeActorControl( player.getId(), SetStatus,
static_cast< uint8_t >( Common::ActorStatus::Idle ) ), static_cast< uint8_t >( Common::ActorStatus::Idle ) ),
true ); true );
player.sendNotice( "Raised {0}", targetPlayer->getName() ); player.sendNotice( "Raised {0}", targetPlayer->getName() );
break; break;

4
src/world/Network/Handlers/PacketHandlers.cpp
View file

@ -95,8 +95,8 @@ void Sapphire::Network::GameConnection::setSearchInfoHandler( FrameworkPtr pFw,
strcpy( searchInfoPacket->data().searchMessage, player.getSearchMessage() ); strcpy( searchInfoPacket->data().searchMessage, player.getSearchMessage() );
queueOutPacket( searchInfoPacket ); queueOutPacket( searchInfoPacket );
player.sendToInRangeSet( makeActorControl142( player.getId(), SetStatusIcon, player.sendToInRangeSet( makeActorControl( player.getId(), SetStatusIcon,
static_cast< uint8_t >( player.getOnlineStatus() ) ), true ); static_cast< uint8_t >( player.getOnlineStatus() ) ), true );
} }
void Sapphire::Network::GameConnection::reqSearchInfoHandler( FrameworkPtr pFw, void Sapphire::Network::GameConnection::reqSearchInfoHandler( FrameworkPtr pFw,

2
src/world/Network/PacketWrappers/ActorControlPacket.h
View file

@ -39,7 +39,7 @@ namespace Sapphire::Network::Packets::Server
}; };
template< typename... Args > template< typename... Args >
std::shared_ptr< ActorControlPacket > makeActorControl142( Args... args ) std::shared_ptr< ActorControlPacket > makeActorControl( Args... args )
{ {
return std::make_shared< ActorControlPacket >( args... ); return std::make_shared< ActorControlPacket >( args... );
} }

2
src/world/Network/PacketWrappers/ActorControlSelfPacket.h
View file

@ -43,7 +43,7 @@ namespace Sapphire::Network::Packets::Server
}; };
template< typename... Args > template< typename... Args >
std::shared_ptr< ActorControlSelfPacket > makeActorControl143( Args... args ) std::shared_ptr< ActorControlSelfPacket > makeActorControlSelf( Args... args )
{ {
return std::make_shared< ActorControlSelfPacket >( args... ); return std::make_shared< ActorControlSelfPacket >( args... );
} }

2
src/world/Network/PacketWrappers/ActorControlTargetPacket.h
View file

@ -41,7 +41,7 @@ namespace Sapphire::Network::Packets::Server
}; };
template< typename... Args > template< typename... Args >
std::shared_ptr< ActorControlTargetPacket > makeActorControl144( Args... args ) std::shared_ptr< ActorControlTargetPacket > makeActorControlTarget( Args... args )
{ {
return std::make_shared< ActorControlTargetPacket >( args... ); return std::make_shared< ActorControlTargetPacket >( args... );
} }

6
src/world/Territory/Housing/HousingInteriorTerritory.cpp
View file

@ -99,7 +99,8 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
} }
if( isFcHouse ) if( isFcHouse )
player.queuePacket( Server::makeActorControl143( player.getId(), Network::ActorControl::HideAdditionalChambersDoor ) ); player.queuePacket(
Server::makeActorControlSelf( player.getId(), Network::ActorControl::HideAdditionalChambersDoor ) );
} }
void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onUpdate( uint64_t tickCount ) void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onUpdate( uint64_t tickCount )
@ -223,7 +224,8 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::removeHousin
for( const auto& player : m_playerMap ) for( const auto& player : m_playerMap )
{ {
auto pkt = Server::makeActorControl143( player.second->getId(), Network::ActorControl::RemoveInteriorHousingItem, slot ); auto pkt = Server::makeActorControlSelf( player.second->getId(), Network::ActorControl::RemoveInteriorHousingItem,
slot );
player.second->queuePacket( pkt ); player.second->queuePacket( pkt );
} }

3
src/world/Territory/HousingZone.cpp
View file

@ -413,7 +413,8 @@ void Sapphire::HousingZone::despawnYardObject( uint16_t landId, uint16_t slot )
for( const auto& player : m_playerMap ) for( const auto& player : m_playerMap )
{ {
auto param = ( landId << 16 ) | slot; auto param = ( landId << 16 ) | slot;
auto pkt = Server::makeActorControl143( player.second->getId(), Network::ActorControl::RemoveExteriorHousingItem, param ); auto pkt = Server::makeActorControlSelf( player.second->getId(), Network::ActorControl::RemoveExteriorHousingItem,
param );
player.second->queuePacket( pkt ); player.second->queuePacket( pkt );
} }

18
src/world/Territory/InstanceContent.cpp
View file

@ -130,9 +130,9 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
for( const auto& playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
auto pPlayer = playerIt.second; auto pPlayer = playerIt.second;
pPlayer->queuePacket( makeActorControl143( pPlayer->getId(), DirectorUpdate, pPlayer->queuePacket( makeActorControlSelf( pPlayer->getId(), DirectorUpdate,
getDirectorId(), 0x40000001, getDirectorId(), 0x40000001,
m_instanceConfiguration->timeLimitmin * 60u ) ); m_instanceConfiguration->timeLimitmin * 60u ) );
} }
if( m_pEntranceEObj ) if( m_pEntranceEObj )
@ -176,7 +176,7 @@ void Sapphire::InstanceContent::onInitDirector( Entity::Player& player )
void Sapphire::InstanceContent::onDirectorSync( Entity::Player& player ) void Sapphire::InstanceContent::onDirectorSync( Entity::Player& player )
{ {
player.queuePacket( makeActorControl143( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) ); player.queuePacket( makeActorControlSelf( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) );
} }
@ -282,7 +282,7 @@ void Sapphire::InstanceContent::startQte()
for( const auto& playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
auto player = playerIt.second; auto player = playerIt.second;
player->queuePacket( makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) ); player->queuePacket( makeActorControlSelf( player->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) );
} }
} }
@ -292,7 +292,7 @@ void Sapphire::InstanceContent::startEventCutscene()
for( const auto& playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
auto player = playerIt.second; auto player = playerIt.second;
player->queuePacket( makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) ); player->queuePacket( makeActorControlSelf( player->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) );
} }
} }
@ -301,7 +301,7 @@ void Sapphire::InstanceContent::endEventCutscene()
for( const auto& playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
auto player = playerIt.second; auto player = playerIt.second;
player->queuePacket( makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) ); player->queuePacket( makeActorControlSelf( player->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) );
} }
} }
@ -412,13 +412,13 @@ void Sapphire::InstanceContent::setCurrentBGM( uint16_t bgmIndex )
// also do note that this code can't control the bgm granularly. (i.e. per player for WoD submap.) oops. // also do note that this code can't control the bgm granularly. (i.e. per player for WoD submap.) oops.
// player->queuePacket( ActorControlSelfPacket( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, 1 ) ); // player->queuePacket( ActorControlSelfPacket( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, 1 ) );
player->queuePacket( player->queuePacket(
makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmIndex ) ); makeActorControlSelf( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmIndex ) );
} }
} }
void Sapphire::InstanceContent::setPlayerBGM( Sapphire::Entity::Player& player, uint16_t bgmId ) void Sapphire::InstanceContent::setPlayerBGM( Sapphire::Entity::Player& player, uint16_t bgmId )
{ {
player.queuePacket( makeActorControl143( player.getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmId ) ); player.queuePacket( makeActorControlSelf( player.getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmId ) );
} }
uint16_t Sapphire::InstanceContent::getCurrentBGM() const uint16_t Sapphire::InstanceContent::getCurrentBGM() const

8
src/world/Territory/QuestBattle.cpp
View file

@ -177,7 +177,7 @@ void Sapphire::QuestBattle::onInitDirector( Entity::Player& player )
void Sapphire::QuestBattle::onDirectorSync( Entity::Player& player ) void Sapphire::QuestBattle::onDirectorSync( Entity::Player& player )
{ {
player.queuePacket( makeActorControl143( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) ); player.queuePacket( makeActorControlSelf( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) );
} }
void Sapphire::QuestBattle::setVar( uint8_t index, uint8_t value ) void Sapphire::QuestBattle::setVar( uint8_t index, uint8_t value )
@ -267,17 +267,17 @@ void Sapphire::QuestBattle::setBranch( uint8_t value )
void Sapphire::QuestBattle::startQte() void Sapphire::QuestBattle::startQte()
{ {
m_pPlayer->queuePacket( makeActorControl143( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) ); m_pPlayer->queuePacket( makeActorControlSelf( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) );
} }
void Sapphire::QuestBattle::startEventCutscene() void Sapphire::QuestBattle::startEventCutscene()
{ {
m_pPlayer->queuePacket( makeActorControl143( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) ); m_pPlayer->queuePacket( makeActorControlSelf( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) );
} }
void Sapphire::QuestBattle::endEventCutscene() void Sapphire::QuestBattle::endEventCutscene()
{ {
m_pPlayer->queuePacket( makeActorControl143( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) ); m_pPlayer->queuePacket( makeActorControlSelf( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) );
} }
void Sapphire::QuestBattle::onRegisterEObj( Entity::EventObjectPtr object ) void Sapphire::QuestBattle::onRegisterEObj( Entity::EventObjectPtr object )

2
src/world/Territory/Territory.cpp
View file

@ -165,7 +165,7 @@ void Sapphire::Territory::setCurrentFestival( uint16_t festivalId, uint16_t addi
{ {
auto player = playerEntry.second; auto player = playerEntry.second;
auto enableFestival = makeActorControl143( player->getId(), SetFestival, festivalId, additionalFestivalId ); auto enableFestival = makeActorControlSelf( player->getId(), SetFestival, festivalId, additionalFestivalId );
playerEntry.second->queuePacket( enableFestival ); playerEntry.second->queuePacket( enableFestival );
} }
} }