Move Cursor enum into enums directory.

5 files changed, 84 insertions, 105 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;
diff --git a/src/resources/cursor.cpp b/src/resources/cursor.cpp
deleted file mode 100644
index cbc430b2a..000000000
--- a/src/resources/cursor.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2012-2016  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "resources/cursor.h"
-
-#include "debug.h"
-
-namespace Cursor
-{
-    static const StrToCursor hoverCursors[] =
-    {
-        {"select", CURSOR_POINTER},
-        {"pointer", CURSOR_POINTER},
-        {"lr", CURSOR_RESIZE_ACROSS},
-        {"rl", CURSOR_RESIZE_ACROSS},
-        {"resizeAcross", CURSOR_RESIZE_ACROSS},
-        {"ud", CURSOR_RESIZE_DOWN},
-        {"du", CURSOR_RESIZE_DOWN},
-        {"resizeDown", CURSOR_RESIZE_DOWN},
-        {"ldru", CURSOR_RESIZE_DOWN_LEFT},
-        {"ruld", CURSOR_RESIZE_DOWN_LEFT},
-        {"ld", CURSOR_RESIZE_DOWN_LEFT},
-        {"ru", CURSOR_RESIZE_DOWN_LEFT},
-        {"resizeDownLeft", CURSOR_RESIZE_DOWN_LEFT},
-        {"lurd", CURSOR_RESIZE_DOWN_RIGHT},
-        {"rdlu", CURSOR_RESIZE_DOWN_RIGHT},
-        {"rd", CURSOR_RESIZE_DOWN_RIGHT},
-        {"lu", CURSOR_RESIZE_DOWN_RIGHT},
-        {"resizeDownRight", CURSOR_RESIZE_DOWN_RIGHT},
-        {"attack", CURSOR_FIGHT},
-        {"fight", CURSOR_FIGHT},
-        {"take", CURSOR_PICKUP},
-        {"pickup", CURSOR_PICKUP},
-        {"talk", CURSOR_TALK},
-        {"action", CURSOR_ACTION},
-        {"left", CURSOR_LEFT},
-        {"up", CURSOR_UP},
-        {"right", CURSOR_RIGHT},
-        {"down", CURSOR_DOWN}
-    };
-
-    Cursor stringToCursor(const std::string &name)
-    {
-        for (size_t f = 0; f < sizeof(hoverCursors) / sizeof(StrToCursor);
-             f ++)
-        {
-            if (hoverCursors[f].str == name)
-                return hoverCursors[f].cursor;
-        }
-        return CURSOR_POINTER;
-    }
-}  // namespace Cursor
diff --git a/src/resources/cursors.cpp b/src/resources/cursors.cpp
new file mode 100644
index 000000000..5ca5ff35a
--- /dev/null
+++ b/src/resources/cursors.cpp
@@ -0,0 +1,69 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/cursors.h"
+
+#include "debug.h"
+
+namespace Cursors
+{
+    static const StrToCursor hoverCursors[] =
+    {
+        {"select", Cursor::CURSOR_POINTER},
+        {"pointer", Cursor::CURSOR_POINTER},
+        {"lr", Cursor::CURSOR_RESIZE_ACROSS},
+        {"rl", Cursor::CURSOR_RESIZE_ACROSS},
+        {"resizeAcross", Cursor::CURSOR_RESIZE_ACROSS},
+        {"ud", Cursor::CURSOR_RESIZE_DOWN},
+        {"du", Cursor::CURSOR_RESIZE_DOWN},
+        {"resizeDown", Cursor::CURSOR_RESIZE_DOWN},
+        {"ldru", Cursor::CURSOR_RESIZE_DOWN_LEFT},
+        {"ruld", Cursor::CURSOR_RESIZE_DOWN_LEFT},
+        {"ld", Cursor::CURSOR_RESIZE_DOWN_LEFT},
+        {"ru", Cursor::CURSOR_RESIZE_DOWN_LEFT},
+        {"resizeDownLeft", Cursor::CURSOR_RESIZE_DOWN_LEFT},
+        {"lurd", Cursor::CURSOR_RESIZE_DOWN_RIGHT},
+        {"rdlu", Cursor::CURSOR_RESIZE_DOWN_RIGHT},
+        {"rd", Cursor::CURSOR_RESIZE_DOWN_RIGHT},
+        {"lu", Cursor::CURSOR_RESIZE_DOWN_RIGHT},
+        {"resizeDownRight", Cursor::CURSOR_RESIZE_DOWN_RIGHT},
+        {"attack", Cursor::CURSOR_FIGHT},
+        {"fight", Cursor::CURSOR_FIGHT},
+        {"take", Cursor::CURSOR_PICKUP},
+        {"pickup", Cursor::CURSOR_PICKUP},
+        {"talk", Cursor::CURSOR_TALK},
+        {"action", Cursor::CURSOR_ACTION},
+        {"left", Cursor::CURSOR_LEFT},
+        {"up", Cursor::CURSOR_UP},
+        {"right", Cursor::CURSOR_RIGHT},
+        {"down", Cursor::CURSOR_DOWN}
+    };
+
+    CursorT stringToCursor(const std::string &name)
+    {
+        for (size_t f = 0; f < sizeof(hoverCursors) / sizeof(StrToCursor);
+             f ++)
+        {
+            if (hoverCursors[f].str == name)
+                return hoverCursors[f].cursor;
+        }
+        return Cursor::CURSOR_POINTER;
+    }
+}  // namespace Cursors
diff --git a/src/resources/cursor.h b/src/resources/cursors.h
index ef4b4da1b..52183722b 100644
--- a/src/resources/cursor.h
+++ b/src/resources/cursors.h
@@ -21,42 +21,21 @@
 #ifndef RESOURCES_CURSOR_H
 #define RESOURCES_CURSOR_H
 
+#include "enums/resources/cursor.h"
+
 #include <string>
 
 #include "localconsts.h"
 
-namespace Cursor
+namespace Cursors
 {
-    /**
-      * Cursors are in graphic order from left to right.
-      * CURSOR_POINTER should be left untouched.
-      * CURSOR_TOTAL should always be last.
-      */
-    enum Cursor
-    {
-        CURSOR_POINTER = 0,
-        CURSOR_RESIZE_ACROSS,
-        CURSOR_RESIZE_DOWN,
-        CURSOR_RESIZE_DOWN_LEFT,
-        CURSOR_RESIZE_DOWN_RIGHT,
-        CURSOR_FIGHT,
-        CURSOR_PICKUP,
-        CURSOR_TALK,
-        CURSOR_ACTION,
-        CURSOR_LEFT,
-        CURSOR_UP,
-        CURSOR_RIGHT,
-        CURSOR_DOWN,
-        CURSOR_TOTAL
-    };
-
     struct StrToCursor final
     {
         std::string str;
-        Cursor cursor;
+        CursorT cursor;
     };
 
-    Cursor stringToCursor(const std::string &name) A_WARN_UNUSED;
+    CursorT stringToCursor(const std::string &name) A_WARN_UNUSED;
 }  // namespace Cursor
 
 #endif  // RESOURCES_CURSOR_H
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;
 };