diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp index 7802162b..51d05193 100644 --- a/src/world/Action/EffectResult.cpp +++ b/src/world/Action/EffectResult.cpp @@ -115,9 +115,9 @@ void EffectResult::statusNoEffect( uint16_t statusId ) m_type = Common::ActionEffectType::StatusNoEffect; } -void EffectResult::mount( uint16_t moundId ) +void EffectResult::mount( uint16_t mountId ) { - m_value = moundId; + m_value = mountId; m_param0 = 1; m_type = Common::ActionEffectType::Mount; diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h index 39aac3f1..02ec2d78 100644 --- a/src/world/Action/EffectResult.h +++ b/src/world/Action/EffectResult.h @@ -26,7 +26,7 @@ namespace Sapphire::World::Action void applyStatusEffect( uint16_t statusId, uint32_t duration, uint16_t param ); void applyStatusEffect( StatusEffect::StatusEffectPtr pStatusEffect ); void statusNoEffect( uint16_t statusId ); - void mount( uint16_t moundId ); + void mount( uint16_t mountId ); Entity::CharaPtr getSource() const; Entity::CharaPtr getTarget() const; diff --git a/src/world/Action/MountAction.cpp b/src/world/Action/MountAction.cpp index 94d13202..1c0170b7 100644 --- a/src/world/Action/MountAction.cpp +++ b/src/world/Action/MountAction.cpp @@ -15,7 +15,7 @@ using namespace Sapphire::Network::Packets::Server; using namespace Sapphire::Network::ActorControl; using namespace Sapphire::World::Action; -MountAction::MountAction( Sapphire::Entity::CharaPtr source, uint32_t mountId, uint16_t sequence, Data::ActionPtr actionData, Sapphire::FrameworkPtr fw ) : +MountAction::MountAction( Sapphire::Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, Data::ActionPtr actionData, Sapphire::FrameworkPtr fw ) : Action::Action( source, 4, sequence, actionData, fw ), m_mountId( mountId ) { diff --git a/src/world/Action/MountAction.h b/src/world/Action/MountAction.h index 37c0595a..1b095b47 100644 --- a/src/world/Action/MountAction.h +++ b/src/world/Action/MountAction.h @@ -8,7 +8,7 @@ namespace Sapphire::World::Action class MountAction : public Action { public: - MountAction( Entity::CharaPtr source, uint32_t mountId, uint16_t sequence, Data::ActionPtr actionData, FrameworkPtr fw ); + MountAction( Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, Data::ActionPtr actionData, FrameworkPtr fw ); virtual ~MountAction() = default; bool preCheck() override; @@ -18,7 +18,7 @@ namespace Sapphire::World::Action void execute() override; private: - uint32_t m_mountId; + uint16_t m_mountId; }; } diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp index 5deaf7ec..4a637af7 100644 --- a/src/world/Manager/ActionMgr.cpp +++ b/src/world/Manager/ActionMgr.cpp @@ -81,7 +81,7 @@ void World::Manager::ActionMgr::handleItemAction( Sapphire::Entity::Player& play action->start(); } -void World::Manager::ActionMgr::handleMountAction( Entity::Player& player, uint32_t mountId, +void World::Manager::ActionMgr::handleMountAction( Entity::Player& player, uint16_t mountId, Data::ActionPtr actionData, uint64_t targetId, uint16_t sequence ) { diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h index a8cf49df..dd1d5f40 100644 --- a/src/world/Manager/ActionMgr.h +++ b/src/world/Manager/ActionMgr.h @@ -29,7 +29,7 @@ namespace Sapphire::World::Manager void handleItemAction( Entity::Player& player, uint32_t itemId, Data::ItemActionPtr itemActionData, uint16_t itemSourceSlot, uint16_t itemSourceContainer ); - void handleMountAction( Entity::Player& player, uint32_t mountId, + void handleMountAction( Entity::Player& player, uint16_t mountId, Data::ActionPtr actionData, uint64_t targetId, uint16_t sequence ); private: diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp index 78bf55d8..2b9f81dd 100644 --- a/src/world/Network/Handlers/ActionHandler.cpp +++ b/src/world/Network/Handlers/ActionHandler.cpp @@ -74,7 +74,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw, { auto action = exdData->get< Data::Action >( 4 ); assert( action ); - actionMgr->handleMountAction( player, actionId, action, targetId, sequence ); + actionMgr->handleMountAction( player, static_cast< uint16_t >( actionId ), action, targetId, sequence ); break; } }