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/iteminfo.h | |
parent | 6c3f20764fcf9e3d03185c1e92e8a678499c744a (diff) | |
download | manaverse-2ec30fd9bac60bb7e4752e3bba0036c078019d0a.tar.gz manaverse-2ec30fd9bac60bb7e4752e3bba0036c078019d0a.tar.bz2 manaverse-2ec30fd9bac60bb7e4752e3bba0036c078019d0a.tar.xz manaverse-2ec30fd9bac60bb7e4752e3bba0036c078019d0a.zip |
Move Cursor enum into enums directory.
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r-- | src/resources/iteminfo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index c61da1bcd..a7d877f65 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -30,7 +30,7 @@ #include "enums/simpletypes/beingtypeid.h" #include "enums/simpletypes/itemcolor.h" -#include "resources/cursor.h" +#include "resources/cursors.h" #include "resources/soundinfo.h" #include "resources/sprite/spritedisplay.h" @@ -287,12 +287,12 @@ class ItemInfo final const A_WARN_UNUSED; void setPickupCursor(const std::string &cursor) - { return setPickupCursor(Cursor::stringToCursor(cursor)); } + { return setPickupCursor(Cursors::stringToCursor(cursor)); } - void setPickupCursor(const Cursor::Cursor &cursor) + void setPickupCursor(const CursorT &cursor) { mPickupCursor = cursor; } - Cursor::Cursor getPickupCursor() const A_WARN_UNUSED + CursorT getPickupCursor() const A_WARN_UNUSED { return mPickupCursor; } void setProtected(const bool b) @@ -373,7 +373,7 @@ class ItemInfo final int mMissEffectId; int maxFloorOffsetX; int maxFloorOffsetY; - Cursor::Cursor mPickupCursor; + CursorT mPickupCursor; bool mProtected; }; |