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

goat can finish this

Browse source
This commit is contained in:
Adam 2018-01-31 02:06:11 +11:00
parent 3606ea6ef6
commit b3cda8ebe6
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,10 @@
#include "EventHandler.h" #include "EventHandler.h"
#include <common/Common.h> #include <common/Common.h>
#include <common/Exd/ExdData.h> #include <common/Exd/ExdData.h>
#include <common/Exd/ExdDataGenerated.h>
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;
extern Core::Data::ExdDataGenerated g_exdDataGen;
using namespace Core::Common; using namespace Core::Common;
@ -17,25 +19,25 @@ std::string Core::Event::getEventName( uint32_t eventId )
{ {
case Event::EventHandler::EventHandlerType::Quest: case Event::EventHandler::EventHandlerType::Quest:
{ {
auto questInfo = g_exdData.getQuestInfo( eventId ); auto questInfo = g_exdDataGen.getQuest( eventId );
if( !questInfo ) if( !questInfo )
return unknown + "Quest"; return unknown + "Quest";
std::string name = questInfo->name_intern; std::string name = questInfo->name;
std::size_t pos = name.find_first_of( "_" ); std::size_t pos = name.find_first_of( "_" );
return questInfo->name_intern.substr( 0, pos ); return questInfo->name.substr( 0, pos );
} }
case Event::EventHandler::EventHandlerType::CustomTalk: case Event::EventHandler::EventHandlerType::CustomTalk:
{ {
auto customTalkInfo = g_exdData.getCustomTalkInfo( eventId ); auto customTalkInfo = g_exdDataGen.getCustomTalk( eventId );
if( !customTalkInfo ) if( !customTalkInfo )
return unknown + "CustomTalk"; return unknown + "CustomTalk";
std::string name = customTalkInfo->name_intern; std::string name = customTalkInfo->name;
std::size_t pos = name.find_first_of( "_" ); std::size_t pos = name.find_first_of( "_" );
return customTalkInfo->name_intern.substr( 0, pos ); return customTalkInfo->name.substr( 0, pos );
} }
case Event::EventHandler::EventHandlerType::Opening: case Event::EventHandler::EventHandlerType::Opening:
{ {
@ -46,7 +48,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
} }
case Event::EventHandler::EventHandlerType::Aetheryte: case Event::EventHandler::EventHandlerType::Aetheryte:
{ {
auto aetherInfo = g_exdData.getAetheryteInfo( eventId & 0xFFFF ); auto aetherInfo = g_exdDataGen.getAetheryte( eventId & 0xFFFF );
if( aetherInfo->isAetheryte ) if( aetherInfo->isAetheryte )
return "Aetheryte"; return "Aetheryte";
return "Aethernet"; return "Aethernet";