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

fix incorrect type used for action object

Browse source
This commit is contained in:
NotAdam 2019-02-09 16:58:16 +11:00
parent cc70d83d06
commit 84073363a8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/world/Action/Action.cpp
View file

@ -37,12 +37,12 @@ uint32_t Sapphire::Action::Action::getId() const
return m_id; return m_id;
} }
Sapphire::Common::ActionType Sapphire::Action::Action::getType() const Sapphire::Common::HandleActionType Sapphire::Action::Action::getType() const
{ {
return m_type; return m_type;
} }
void Sapphire::Action::Action::setType( Sapphire::Common::ActionType type ) void Sapphire::Action::Action::setType( Sapphire::Common::HandleActionType type )
{ {
m_type = type; m_type = type;
} }

6
src/world/Action/Action.h
View file

@ -24,8 +24,8 @@ namespace Sapphire::Action
uint32_t getId() const; uint32_t getId() const;
Common::ActionType getType() const; Common::HandleActionType getType() const;
void setType( Common::ActionType type ); void setType( Common::HandleActionType type );
void setTargetChara( Entity::CharaPtr chara ); void setTargetChara( Entity::CharaPtr chara );
Entity::CharaPtr getTargetChara() const; Entity::CharaPtr getTargetChara() const;
@ -55,7 +55,7 @@ namespace Sapphire::Action
protected: protected:
uint32_t m_id; uint32_t m_id;
Common::ActionType m_type; Common::HandleActionType m_type;
uint64_t m_startTime; uint64_t m_startTime;
uint32_t m_castTime; uint32_t m_castTime;