From 3f8f53cab8caa44b1485e3bb59e3232ce8ed5128 Mon Sep 17 00:00:00 2001 From: Antz Date: Thu, 5 Apr 2018 10:48:21 +0100 Subject: [PATCH] Improving Build system and removing Common.h clutter --- src/shared/Common/Common.h | 31 +--------------- src/shared/Common/ServerDefines.h | 59 +++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 30 deletions(-) create mode 100644 src/shared/Common/ServerDefines.h diff --git a/src/shared/Common/Common.h b/src/shared/Common/Common.h index 02befe1d..0ece0088 100644 --- a/src/shared/Common/Common.h +++ b/src/shared/Common/Common.h @@ -76,6 +76,7 @@ #include #include #include +#include "ServerDefines.h" #if defined(__sun__) #include // finite() on Solaris @@ -202,36 +203,6 @@ enum TimeConstants IN_MILLISECONDS = 1000 }; -/** - * @brief - * - */ -enum AccountTypes -{ - SEC_PLAYER = 0, - SEC_MODERATOR = 1, - SEC_GAMEMASTER = 2, - SEC_ADMINISTRATOR = 3, - SEC_CONSOLE = 4 // must be always last in list, accounts must have less security level always also -}; - -/** - * @brief Used in mangosd/realmd - * - */ -enum RealmFlags -{ - REALM_FLAG_NONE = 0x00, - REALM_FLAG_INVALID = 0x01, - REALM_FLAG_OFFLINE = 0x02, - REALM_FLAG_SPECIFYBUILD = 0x04, // client will show realm version in RealmList screen in form "RealmName (major.minor.revision.build)" - REALM_FLAG_UNK1 = 0x08, - REALM_FLAG_UNK2 = 0x10, - REALM_FLAG_NEW_PLAYERS = 0x20, - REALM_FLAG_RECOMMENDED = 0x40, - REALM_FLAG_FULL = 0x80 -}; - /** * @brief * diff --git a/src/shared/Common/ServerDefines.h b/src/shared/Common/ServerDefines.h new file mode 100644 index 00000000..76114702 --- /dev/null +++ b/src/shared/Common/ServerDefines.h @@ -0,0 +1,59 @@ +/** + * MaNGOS is a full featured server for World of Warcraft, supporting + * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8 + * + * Copyright (C) 2005-2018 MaNGOS project + * + * 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 + * (at your option) 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * World of Warcraft, and all World of Warcraft or Warcraft art, images, + * and lore are copyrighted by Blizzard Entertainment, Inc. + */ + +#ifndef MANGOSSERVER_SERVERDEFINES_H +#define MANGOSSERVER_SERVERDEFINES_H + +/** + * @brief + * + */ +enum AccountTypes +{ + SEC_PLAYER = 0, + SEC_MODERATOR = 1, + SEC_GAMEMASTER = 2, + SEC_ADMINISTRATOR = 3, + SEC_CONSOLE = 4 // must be always last in list, accounts must have less security level always also +}; + +/** + * @brief Used in mangosd/realmd + * + */ +enum RealmFlags +{ + REALM_FLAG_NONE = 0x00, + REALM_FLAG_INVALID = 0x01, + REALM_FLAG_OFFLINE = 0x02, + REALM_FLAG_SPECIFYBUILD = 0x04, // client will show realm version in RealmList screen in form "RealmName (major.minor.revision.build)" + REALM_FLAG_UNK1 = 0x08, + REALM_FLAG_UNK2 = 0x10, + REALM_FLAG_NEW_PLAYERS = 0x20, + REALM_FLAG_RECOMMENDED = 0x40, + REALM_FLAG_FULL = 0x80 +}; + + +#endif