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

Merge remote-tracking branch 'remotes/origin/develop' into develop_c

Browse source
This commit is contained in:
collett 2020-01-26 19:35:08 +09:00
commit bbcf5a82eb
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/world/Action/EffectResult.cpp
View file

@ -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;

2
src/world/Action/EffectResult.h
View file

@ -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;

2
src/world/Action/MountAction.cpp
View file

@ -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 )
{

4
src/world/Action/MountAction.h
View file

@ -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;
};
}

2
src/world/Manager/ActionMgr.cpp
View file

@ -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 )
{

2
src/world/Manager/ActionMgr.h
View file

@ -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:

2
src/world/Network/Handlers/ActionHandler.cpp
View file

@ -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;
}
}