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/being | |
| 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/being')
| -rw-r--r-- | src/being/being.h | 2 | ||||
| -rw-r--r-- | src/being/flooritem.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/being/being.h b/src/being/being.h index 78f0ec65c..06264b1d5 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -877,7 +877,7 @@ class Being notfinal : public ActorSprite, const int attackId, const int level) const restrict2 A_WARN_UNUSED; - Cursor::Cursor getHoverCursor() const restrict2 A_WARN_UNUSED + CursorT getHoverCursor() const restrict2 A_WARN_UNUSED { return mInfo ? mInfo->getHoverCursor() : Cursor::CURSOR_POINTER; } void addAfkEffect() restrict2; diff --git a/src/being/flooritem.h b/src/being/flooritem.h index 23c32f446..28e5c7190 100644 --- a/src/being/flooritem.h +++ b/src/being/flooritem.h @@ -33,7 +33,7 @@ #include "being/actorsprite.h" -#include "resources/cursor.h" +#include "resources/cursors.h" class ItemInfo; @@ -113,7 +113,7 @@ class FloorItem final : public ActorSprite void disableHightlight() { mHighlight = false; } - Cursor::Cursor getHoverCursor() const A_WARN_UNUSED + CursorT getHoverCursor() const A_WARN_UNUSED { return mCursor; } void setCards(const int *const cards, int sz); @@ -142,7 +142,7 @@ class FloorItem final : public ActorSprite int mHeightPosDiff; ItemTypeT mItemType; unsigned int mPickupCount; - Cursor::Cursor mCursor; + CursorT mCursor; ItemColor mColor; Identified mIdentified; Damaged mDamaged; |