From 9dfca22e10d75cedc20a68ca3550efb9364be9ba Mon Sep 17 00:00:00 2001 From: Mordred Date: Sun, 4 Feb 2018 02:26:02 +0100 Subject: [PATCH] Adjusted wrong casttime for eventactions, needs fixing in ex.json --- src/common/Exd/ExdDataGenerated.cpp | 2 +- src/servers/sapphire_zone/Action/EventAction.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp index 56df045f..a35c11a4 100644 --- a/src/common/Exd/ExdDataGenerated.cpp +++ b/src/common/Exd/ExdDataGenerated.cpp @@ -1432,7 +1432,7 @@ auto row = exdData->m_EventActionDat.get_row( row_id ); name = exdData->getField< std::string >( row, 0 ); icon = exdData->getField< uint16_t >( row, 1 ); - castTime = exdData->getField< uint16_t >( row, 3 ); + castTime = exdData->getField< uint8_t >( row, 2 ); } Core::Data::EventIconPriority::EventIconPriority( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp index 24a08001..9fa93a45 100644 --- a/src/servers/sapphire_zone/Action/EventAction.cpp +++ b/src/servers/sapphire_zone/Action/EventAction.cpp @@ -28,7 +28,7 @@ Core::Action::EventAction::EventAction( Entity::ActorPtr pActor, uint32_t eventI m_handleActionType = HandleActionType::Event; m_eventId = eventId; m_id = action; - m_castTime = g_exdDataGen.getEventAction( action )->castTime * 100; // TODO: Add security checks. + m_castTime = g_exdDataGen.getEventAction( action )->castTime * 1000; // TODO: Add security checks. m_onActionFinishClb = finishRef; m_onActionInterruptClb = interruptRef; m_pSource = pActor;