From db9e2faf55d45926da9d60c1053e42541025db6e Mon Sep 17 00:00:00 2001 From: Dantestyle Date: Thu, 12 Jul 2018 01:39:16 +0200 Subject: [PATCH 1/2] more EventHelper on chat, I like them --- src/servers/sapphire_zone/Event/EventHelper.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp index 1b4c34b6..e4e13cdf 100644 --- a/src/servers/sapphire_zone/Event/EventHelper.cpp +++ b/src/servers/sapphire_zone/Event/EventHelper.cpp @@ -70,7 +70,18 @@ std::string Core::Event::getEventName( uint32_t eventId ) case Event::EventHandler::EventHandlerType::Warp: { - return "ChocoboTaxi"; + auto warpInfo = pExdData->get< Core::Data::Warp >( eventId ); + if( warpInfo ) + return "WarpTaxi"; + return unknown + "ChocoboWarp"; //who know + } + case Event::EventHandler::EventHandlerType::Shop: + { + auto shopInfo = pExdData->get< Core::Data::GilShop >( eventId ); + std::string name = shopInfo->name; + + if( shopInfo ) + return "GilShop - " + name; } default: { From 8ac7191502d7cbd2789da31f0a17c1f4ca20ada6 Mon Sep 17 00:00:00 2001 From: Mordred <30826167+SapphireMordred@users.noreply.github.com> Date: Tue, 17 Jul 2018 16:11:09 +0200 Subject: [PATCH 2/2] Update EventHelper.cpp --- src/servers/sapphire_zone/Event/EventHelper.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp index e4e13cdf..63eb538d 100644 --- a/src/servers/sapphire_zone/Event/EventHelper.cpp +++ b/src/servers/sapphire_zone/Event/EventHelper.cpp @@ -81,7 +81,8 @@ std::string Core::Event::getEventName( uint32_t eventId ) std::string name = shopInfo->name; if( shopInfo ) - return "GilShop - " + name; + return name; + return unknown + "GilShop"; } default: {