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

fix build

Browse source
This commit is contained in:
collett 2020-05-11 06:43:07 +09:00
parent b70435413e
commit 15e5d60b0b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/world/Event/EventHandler.h
View file

@ -45,7 +45,7 @@ namespace Sapphire::Event
TableGame = 24,
};
enum EventHandlerType : uint16_t
enum class EventHandlerType : uint16_t
{
Quest = 0x0001,
Warp = 0x0002,

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

@ -42,7 +42,7 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( const Packets::FFXIVAR
const auto actorId = packet.data().actorId;
const auto eventId = packet.data().eventId;
auto eventType = static_cast< uint16_t >( eventId >> 16 );
auto eventType = static_cast< Event::EventHandler::EventHandlerType >( eventId >> 16 );
std::string eventName = "onTalk";
std::string objName = eventMgr.getEventName( eventId );
@ -83,7 +83,7 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVA
const auto actorId = packet.data().actorId;
const auto eventId = packet.data().eventId;
const auto emoteId = packet.data().emoteId;
const auto eventType = static_cast< uint16_t >( eventId >> 16 );
const auto eventType = static_cast< Event::EventHandler::EventHandlerType >( eventId >> 16 );
std::string eventName = "onEmote";
std::string objName = eventMgr.getEventName( eventId );

4
src/world/Script/ScriptMgr.cpp
View file

@ -284,7 +284,7 @@ bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_
if( !activeQuests )
continue;
uint32_t questId = activeQuests->c.questId | Event::EventHandler::EventHandlerType::Quest << 16;
uint32_t questId = activeQuests->c.questId | static_cast< uint16_t >( Event::EventHandler::EventHandlerType::Quest ) << 16;
auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( questId );
if( script )
@ -311,7 +311,7 @@ bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player
if( !activeQuests )
continue;
uint32_t questId = activeQuests->c.questId | Event::EventHandler::EventHandlerType::Quest << 16;
uint32_t questId = activeQuests->c.questId | static_cast< uint16_t >( Event::EventHandler::EventHandlerType::Quest ) << 16;
auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( questId );
if( script )