Move menutype into enums directory.

5 files changed, 28 insertions, 31 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e145e1322..048f2c5c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1545,7 +1545,7 @@ SET(SRCS
     net/eathena/marketrecv.h
     net/eathena/menu.cpp
     net/eathena/menu.h
-    net/eathena/menutype.h
+    enums/net/menutype.h
     net/eathena/mercenaryhandler.cpp
     net/eathena/mercenaryhandler.h
     net/eathena/mercenaryrecv.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b70f89bd..6c36f4f98 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1750,7 +1750,7 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
 	      net/eathena/marketrecv.h \
 	      net/eathena/menu.cpp \
 	      net/eathena/menu.h \
-	      net/eathena/menutype.h \
+	      enums/net/menutype.h \
 	      net/eathena/mercenaryhandler.cpp \
 	      net/eathena/mercenaryhandler.h \
 	      net/eathena/mercenaryrecv.cpp \
diff --git a/src/net/eathena/menutype.h b/src/enums/net/menutype.h
index 3e5e74b67..f9b024bcf 100644
--- a/src/net/eathena/menutype.h
+++ b/src/enums/net/menutype.h
@@ -21,31 +21,28 @@
 #ifndef NET_EATHENA_MENUTYPE_H
 #define NET_EATHENA_MENUTYPE_H
 
-namespace EAthena
+#include "enums/simpletypes/enumdefines.h"
+
+enumStart(MenuType)
 {
-    namespace MenuType
-    {
-        enum Type
-        {
-            Unknown = 0,
-            Analysis,
-            AutoSpell,
-            AutoShadowSpell,
-            ChangeMaterial,
-            CreateConvert,
-            Eggs,
-            Feel,
-            Identify,
-            MagicDecoy,
-            MakingArrows,
-            PoisoningWeapon,
-            ReadingSpellBook,
-            RepairWespon,
-            Teleport,
-            Warp,
-            WeaponeRefine
-        };
-    }  // namespace MenuType
-}  // namespace EAthena
+    Unknown = 0,
+    Analysis,
+    AutoSpell,
+    AutoShadowSpell,
+    ChangeMaterial,
+    CreateConvert,
+    Eggs,
+    Feel,
+    Identify,
+    MagicDecoy,
+    MakingArrows,
+    PoisoningWeapon,
+    ReadingSpellBook,
+    RepairWespon,
+    Teleport,
+    Warp,
+    WeaponeRefine
+}
+enumEnd(MenuType);
 
 #endif  // NET_EATHENA_MENUTYPE_H
diff --git a/src/net/eathena/menu.cpp b/src/net/eathena/menu.cpp
index 2be57c7ed..4de4c85d8 100644
--- a/src/net/eathena/menu.cpp
+++ b/src/net/eathena/menu.cpp
@@ -18,11 +18,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "net/eathena/menutype.h"
+#include "enums/net/menutype.h"
 
 #include "debug.h"
 
 namespace EAthena
 {
-    MenuType::Type menu = MenuType::Unknown;
+    MenuTypeT menu = MenuType::Unknown;
 }  // namespace EAthena
diff --git a/src/net/eathena/menu.h b/src/net/eathena/menu.h
index 81ff9b500..97ef41221 100644
--- a/src/net/eathena/menu.h
+++ b/src/net/eathena/menu.h
@@ -21,11 +21,11 @@
 #ifndef NET_EATHENA_MENU_H
 #define NET_EATHENA_MENU_H
 
-#include "net/eathena/menutype.h"
+#include "enums/net/menutype.h"
 
 namespace EAthena
 {
-    extern MenuType::Type menu;
+    extern MenuTypeT menu;
 }  // namespace EAthena
 
 #endif  // NET_EATHENA_MENU_H