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

Removed redundancy in EventHandler type declarations

Browse source
This commit is contained in:
Mordred Admin 2018-01-10 10:47:47 +01:00
parent 0f16ad4812
commit 6d6c71d6af
3 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/common/Common.h
View file

@ -319,33 +319,6 @@ namespace Common {
}; };
enum EventType : uint16_t
{
Quest = 0x0001,
Warp = 0x0002,
Shop = 0x0004,
Aetheryte = 0x0005,
GuildLeveAssignment = 0x0006,
DefaultTalk = 0x0009,
CustomTalk = 0x000B,
CompanyLeveOfficer = 0x000C,
CraftLeve = 0x000E,
GimmickAccessor = 0x000F,
GimmickBill = 0x0010,
GimmickRect = 0x0011,
ChocoboTaxiStand = 0x0012,
Opening = 0x0013,
ExitRange = 0x0014,
GCShop = 0x0016,
GuildOrderGuide = 0x0017,
GuildOrderOfficer = 0x0018,
ContentNpc = 0x0019,
Story = 0x001A,
SpecialShop = 0x001B,
BahamutGuide = 0x001C,
FcTalk = 0x001F,
};
enum struct ActionAspect : uint8_t enum struct ActionAspect : uint8_t
{ {
None = 0, // Doesn't imply unaspected None = 0, // Doesn't imply unaspected

10
src/servers/sapphire_zone/Event/EventHelper.cpp
View file

@ -15,7 +15,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
switch( eventType ) switch( eventType )
{ {
case EventType::Quest: case Event::EventHandler::EventHandlerType::Quest:
{ {
auto questInfo = g_exdData.getQuestInfo( eventId ); auto questInfo = g_exdData.getQuestInfo( eventId );
if( !questInfo ) if( !questInfo )
@ -26,7 +26,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
return questInfo->name_intern.substr( 0, pos ); return questInfo->name_intern.substr( 0, pos );
} }
case EventType::CustomTalk: case Event::EventHandler::EventHandlerType::CustomTalk:
{ {
auto customTalkInfo = g_exdData.getCustomTalkInfo( eventId ); auto customTalkInfo = g_exdData.getCustomTalkInfo( eventId );
if( !customTalkInfo ) if( !customTalkInfo )
@ -37,21 +37,21 @@ std::string Core::Event::getEventName( uint32_t eventId )
return customTalkInfo->name_intern.substr( 0, pos ); return customTalkInfo->name_intern.substr( 0, pos );
} }
case EventType::Opening: case Event::EventHandler::EventHandlerType::Opening:
{ {
auto openingInfo = g_exdData.getOpeningInfo( eventId ); auto openingInfo = g_exdData.getOpeningInfo( eventId );
if( openingInfo ) if( openingInfo )
return openingInfo->name; return openingInfo->name;
return unknown + "Opening"; return unknown + "Opening";
} }
case EventType::Aetheryte: case Event::EventHandler::EventHandlerType::Aetheryte:
{ {
auto aetherInfo = g_exdData.getAetheryteInfo( eventId & 0xFFFF ); auto aetherInfo = g_exdData.getAetheryteInfo( eventId & 0xFFFF );
if( aetherInfo->isAetheryte ) if( aetherInfo->isAetheryte )
return "Aetheryte"; return "Aetheryte";
return "Aethernet"; return "Aethernet";
} }
case EventType::Warp: case Event::EventHandler::EventHandlerType::Warp:
{ {
return "ChocoboTaxi"; return "ChocoboTaxi";
} }

6
src/servers/sapphire_zone/Script/ScriptManager.cpp
View file

@ -158,7 +158,7 @@ bool Core::Scripting::ScriptManager::onTalk( Entity::Player& player, uint64_t ac
uint32_t scriptId = eventId; uint32_t scriptId = eventId;
// aethernet/aetherytes need to be handled separately // aethernet/aetherytes need to be handled separately
if( eventType == Common::EventType::Aetheryte ) if( eventType == Event::EventHandler::EventHandlerType::Aetheryte )
{ {
auto aetherInfo = g_exdData.getAetheryteInfo( eventId & 0xFFFF ); auto aetherInfo = g_exdData.getAetheryteInfo( eventId & 0xFFFF );
scriptId = EVENTSCRIPT_AETHERYTE_ID; scriptId = EVENTSCRIPT_AETHERYTE_ID;
@ -179,7 +179,7 @@ bool Core::Scripting::ScriptManager::onTalk( Entity::Player& player, uint64_t ac
} }
else else
{ {
if ( eventType == Common::EventType::Quest ) if ( eventType == Event::EventHandler::EventHandlerType::Quest )
{ {
auto questInfo = g_exdData.getQuestInfo( eventId ); auto questInfo = g_exdData.getQuestInfo( eventId );
if ( questInfo ) if ( questInfo )
@ -284,7 +284,7 @@ bool Core::Scripting::ScriptManager::onEmote( Entity::Player& player, uint64_t a
{ {
uint16_t eventType = eventId >> 16; uint16_t eventType = eventId >> 16;
if( eventType == Common::EventType::Quest ) if( eventType == Event::EventHandler::EventHandlerType::Quest )
{ {
auto questInfo = g_exdData.getQuestInfo( eventId ); auto questInfo = g_exdData.getQuestInfo( eventId );
if( questInfo ) if( questInfo )