From b3145fb5f1ea419d9b3ee60450866fd199ee1103 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 4 Oct 2016 23:18:25 +0300 Subject: Move menutype into enums directory. --- src/net/eathena/menu.cpp | 4 ++-- src/net/eathena/menu.h | 4 ++-- src/net/eathena/menutype.h | 51 ---------------------------------------------- 3 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 src/net/eathena/menutype.h (limited to 'src/net') 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 . */ -#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 . - */ - -#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