From b3145fb5f1ea419d9b3ee60450866fd199ee1103 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 4 Oct 2016 23:18:25 +0300
Subject: Move menutype into enums directory.

---
 src/CMakeLists.txt         |  2 +-
 src/Makefile.am            |  2 +-
 src/enums/net/menutype.h   | 48 +++++++++++++++++++++++++++++++++++++++++++
 src/net/eathena/menu.cpp   |  4 ++--
 src/net/eathena/menu.h     |  4 ++--
 src/net/eathena/menutype.h | 51 ----------------------------------------------
 6 files changed, 54 insertions(+), 57 deletions(-)
 create mode 100644 src/enums/net/menutype.h
 delete mode 100644 src/net/eathena/menutype.h

(limited to 'src')

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/enums/net/menutype.h b/src/enums/net/menutype.h
new file mode 100644
index 000000000..f9b024bcf
--- /dev/null
+++ b/src/enums/net/menutype.h
@@ -0,0 +1,48 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014-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/>.
+ */
+
+#ifndef NET_EATHENA_MENUTYPE_H
+#define NET_EATHENA_MENUTYPE_H
+
+#include "enums/simpletypes/enumdefines.h"
+
+enumStart(MenuType)
+{
+    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
diff --git a/src/net/eathena/menutype.h b/src/net/eathena/menutype.h
deleted file mode 100644
index 3e5e74b67..000000000
--- a/src/net/eathena/menutype.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2014-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/>.
- */
-
-#ifndef NET_EATHENA_MENUTYPE_H
-#define NET_EATHENA_MENUTYPE_H
-
-namespace EAthena
-{
-    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
-
-#endif  // NET_EATHENA_MENUTYPE_H
-- 
cgit v1.2.3-60-g2f50