From 84073363a86d43cf8fbecd3d02a287634d19fe16 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sat, 9 Feb 2019 16:58:16 +1100 Subject: [PATCH] fix incorrect type used for action object --- src/world/Action/Action.cpp | 4 ++-- src/world/Action/Action.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index 0838cd21..db778334 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -37,12 +37,12 @@ uint32_t Sapphire::Action::Action::getId() const return m_id; } -Sapphire::Common::ActionType Sapphire::Action::Action::getType() const +Sapphire::Common::HandleActionType Sapphire::Action::Action::getType() const { return m_type; } -void Sapphire::Action::Action::setType( Sapphire::Common::ActionType type ) +void Sapphire::Action::Action::setType( Sapphire::Common::HandleActionType type ) { m_type = type; } diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h index 4448ab67..116d7a9b 100644 --- a/src/world/Action/Action.h +++ b/src/world/Action/Action.h @@ -24,8 +24,8 @@ namespace Sapphire::Action uint32_t getId() const; - Common::ActionType getType() const; - void setType( Common::ActionType type ); + Common::HandleActionType getType() const; + void setType( Common::HandleActionType type ); void setTargetChara( Entity::CharaPtr chara ); Entity::CharaPtr getTargetChara() const; @@ -55,7 +55,7 @@ namespace Sapphire::Action protected: uint32_t m_id; - Common::ActionType m_type; + Common::HandleActionType m_type; uint64_t m_startTime; uint32_t m_castTime;