summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-10-04 23:18:25 +0300
committerAndrei Karas <akaras@inbox.ru>2016-10-04 23:18:25 +0300
commitb3145fb5f1ea419d9b3ee60450866fd199ee1103 (patch)
treee833197c9ccb02114f51dad34f58dab66c2b8b70 /src/net/eathena
parente7dcc170e6a4ceea56035a587af6de62330efb09 (diff)
downloadplus-b3145fb5f1ea419d9b3ee60450866fd199ee1103.tar.gz
plus-b3145fb5f1ea419d9b3ee60450866fd199ee1103.tar.bz2
plus-b3145fb5f1ea419d9b3ee60450866fd199ee1103.tar.xz
plus-b3145fb5f1ea419d9b3ee60450866fd199ee1103.zip
Move menutype into enums directory.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/menu.cpp4
-rw-r--r--src/net/eathena/menu.h4
-rw-r--r--src/net/eathena/menutype.h51
3 files changed, 4 insertions, 55 deletions
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