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

Some naming changes for actions

Browse source
This commit is contained in:
Mordred 2019-04-28 23:34:43 +02:00
parent d3320f7a10
commit b4b5c59bfa
7 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/Common.h
View file

@ -983,6 +983,7 @@ namespace Sapphire::Common
SingleTarget = 1, SingleTarget = 1,
CircularAOE = 2, CircularAOE = 2,
RectangularAOE = 4, RectangularAOE = 4,
CircularAoEPlaced = 7
}; };
using PlayerStateFlagList = std::vector< PlayerStateFlag >; using PlayerStateFlagList = std::vector< PlayerStateFlag >;

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

@ -100,7 +100,7 @@ bool Sapphire::Action::Action::init()
m_primaryCostType = static_cast< Common::ActionPrimaryCostType >( m_actionData->costType ); m_primaryCostType = static_cast< Common::ActionPrimaryCostType >( m_actionData->costType );
m_primaryCost = m_actionData->cost; m_primaryCost = m_actionData->cost;
if( !m_actionData->targetArea ) /*if( !m_actionData->targetArea )
{ {
// override pos to target position // override pos to target position
// todo: this is kinda dirty // todo: this is kinda dirty
@ -112,7 +112,7 @@ bool Sapphire::Action::Action::init()
break; break;
} }
} }
} }*/
// todo: add missing rows for secondaryCostType/secondaryCostType and rename the current rows to primaryCostX // todo: add missing rows for secondaryCostType/secondaryCostType and rename the current rows to primaryCostX

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

@ -17,8 +17,8 @@ World::Manager::ActionMgr::ActionMgr( Sapphire::FrameworkPtr pFw ) :
} }
void World::Manager::ActionMgr::handleAoEPlayerAction( Entity::Player& player, uint32_t actionId, void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId,
Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos ) Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos )
{ {
player.sendDebug( "got aoe act: {0}", actionData->name ); player.sendDebug( "got aoe act: {0}", actionData->name );

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

@ -23,8 +23,8 @@ namespace Sapphire::World::Manager
void handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId, void handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId,
Data::ActionPtr actionData, uint64_t targetId ); Data::ActionPtr actionData, uint64_t targetId );
void handleAoEPlayerAction( Entity::Player& player, uint32_t actionId, void handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId,
Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos ); Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos );
void handleItemAction( Entity::Player& player, uint32_t itemId, Data::ItemActionPtr itemActionData, void handleItemAction( Entity::Player& player, uint32_t itemId, Data::ItemActionPtr itemActionData,
uint16_t itemSourceSlot, uint16_t itemSourceContainer ); uint16_t itemSourceSlot, uint16_t itemSourceContainer );

2
src/world/Network/GameConnection.cpp
View file

@ -73,7 +73,7 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH
setZoneHandler( ClientZoneIpcType::DiscoveryHandler, "DiscoveryHandler", &GameConnection::discoveryHandler ); setZoneHandler( ClientZoneIpcType::DiscoveryHandler, "DiscoveryHandler", &GameConnection::discoveryHandler );
setZoneHandler( ClientZoneIpcType::SkillHandler, "ActionHandler", &GameConnection::actionHandler ); setZoneHandler( ClientZoneIpcType::SkillHandler, "ActionHandler", &GameConnection::actionHandler );
setZoneHandler( ClientZoneIpcType::AoESkillHandler, "AoESkillHandler", &GameConnection::aoeActionHandler ); setZoneHandler( ClientZoneIpcType::AoESkillHandler, "AoESkillHandler", &GameConnection::placedActionHandler );
setZoneHandler( ClientZoneIpcType::GMCommand1, "GMCommand1", &GameConnection::gm1Handler ); setZoneHandler( ClientZoneIpcType::GMCommand1, "GMCommand1", &GameConnection::gm1Handler );
setZoneHandler( ClientZoneIpcType::GMCommand2, "GMCommand2", &GameConnection::gm2Handler ); setZoneHandler( ClientZoneIpcType::GMCommand2, "GMCommand2", &GameConnection::gm2Handler );

4
src/world/Network/GameConnection.h
View file

@ -157,8 +157,8 @@ namespace Sapphire::Network
DECLARE_HANDLER( cfDutyAccepted ); DECLARE_HANDLER( cfDutyAccepted );
DECLARE_HANDLER( actionHandler ); DECLARE_HANDLER( actionHandler );
DECLARE_HANDLER( aoeActionHandler ); DECLARE_HANDLER( placedActionHandler );
DECLARE_HANDLER( gm1Handler ); DECLARE_HANDLER( gm1Handler );

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

@ -27,7 +27,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
const auto itemSourceSlot = packet.data().itemSourceSlot; const auto itemSourceSlot = packet.data().itemSourceSlot;
const auto itemSourceContainer = packet.data().itemSourceContainer; const auto itemSourceContainer = packet.data().itemSourceContainer;
// player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId ); player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId );
auto exdData = m_pFw->get< Data::ExdDataGenerated >(); auto exdData = m_pFw->get< Data::ExdDataGenerated >();
assert( exdData ); assert( exdData );
@ -81,9 +81,9 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
} }
void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw, void Sapphire::Network::GameConnection::placedActionHandler( FrameworkPtr pFw,
const Packets::FFXIVARR_PACKET_RAW& inPacket, const Packets::FFXIVARR_PACKET_RAW& inPacket,
Entity::Player& player ) Entity::Player& player )
{ {
const auto packet = ZoneChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket ); const auto packet = ZoneChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket );
@ -99,8 +99,8 @@ void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw,
return; return;
} }
// player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}", player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}",
// type, sequence, actionId, pos.x, pos.y, pos.z ); type, sequence, actionId, pos.x, pos.y, pos.z );
auto exdData = m_pFw->get< Data::ExdDataGenerated >(); auto exdData = m_pFw->get< Data::ExdDataGenerated >();
assert( exdData ); assert( exdData );
@ -112,5 +112,5 @@ void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw,
return; return;
auto actionMgr = pFw->get< World::Manager::ActionMgr >(); auto actionMgr = pFw->get< World::Manager::ActionMgr >();
actionMgr->handleAoEPlayerAction( player, actionId, action, pos ); actionMgr->handlePlacedPlayerAction( player, actionId, action, pos );
} }