diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-10-04 03:21:47 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-10-04 03:22:35 +0300 |
commit | 2ec30fd9bac60bb7e4752e3bba0036c078019d0a (patch) | |
tree | 7169ef621dd77c70843965f35713274235a70224 /src/resources/beinginfo.h | |
parent | 6c3f20764fcf9e3d03185c1e92e8a678499c744a (diff) | |
download | mv-2ec30fd9bac60bb7e4752e3bba0036c078019d0a.tar.gz mv-2ec30fd9bac60bb7e4752e3bba0036c078019d0a.tar.bz2 mv-2ec30fd9bac60bb7e4752e3bba0036c078019d0a.tar.xz mv-2ec30fd9bac60bb7e4752e3bba0036c078019d0a.zip |
Move Cursor enum into enums directory.
Diffstat (limited to 'src/resources/beinginfo.h')
-rw-r--r-- | src/resources/beinginfo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index c1a9ccd7b..3c5a9ab98 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -31,7 +31,7 @@ #include "enums/simpletypes/itemcolor.h" #include "resources/beingmenuitem.h" -#include "resources/cursor.h" +#include "resources/cursors.h" #include "resources/soundinfo.h" #include "resources/sprite/spritedisplay.h" @@ -81,12 +81,12 @@ class BeingInfo final { mTargetCursorSize = targetSize; } void setHoverCursor(const std::string &name) - { return setHoverCursor(Cursor::stringToCursor(name)); } + { return setHoverCursor(Cursors::stringToCursor(name)); } - void setHoverCursor(const Cursor::Cursor &cursor) + void setHoverCursor(const CursorT &cursor) { mHoverCursor = cursor; } - Cursor::Cursor getHoverCursor() const A_WARN_UNUSED + CursorT getHoverCursor() const A_WARN_UNUSED { return mHoverCursor; } TargetCursorSizeT getTargetCursorSize() const A_WARN_UNUSED @@ -347,7 +347,7 @@ class BeingInfo final SpriteDisplay mDisplay; std::string mName; TargetCursorSizeT mTargetCursorSize; - Cursor::Cursor mHoverCursor; + CursorT mHoverCursor; ItemSoundEvents mSounds; Attacks mAttacks; std::vector<BeingMenuItem> mMenu; |