diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-11 12:00:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-11 12:00:06 +0300 |
commit | 928145e71e073842c7e8947eda7e56050229b5f2 (patch) | |
tree | 703ccf18d92f80ab01b1dd2341b08b74901f0888 | |
parent | a39eb85431bf1b18fcd485aaee824ac7cde34a08 (diff) | |
download | mv-928145e71e073842c7e8947eda7e56050229b5f2.tar.gz mv-928145e71e073842c7e8947eda7e56050229b5f2.tar.bz2 mv-928145e71e073842c7e8947eda7e56050229b5f2.tar.xz mv-928145e71e073842c7e8947eda7e56050229b5f2.zip |
extract consts form emoteshortcut into separate file.
-rw-r--r-- | src/emoteshortcut.h | 4 | ||||
-rw-r--r-- | src/emoteshortcutconsts.h | 26 | ||||
-rw-r--r-- | src/gui/windows/outfitwindow.cpp | 2 |
3 files changed, 29 insertions, 3 deletions
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h index 3e03a18f5..45bfcdabc 100644 --- a/src/emoteshortcut.h +++ b/src/emoteshortcut.h @@ -22,9 +22,9 @@ #ifndef EMOTESHORTCUT_H #define EMOTESHORTCUT_H -#include "localconsts.h" +#include "emoteshortcutconsts.h" -static const int SHORTCUT_EMOTES = 48; +#include "localconsts.h" /** * The class which keeps track of the emote shortcuts. diff --git a/src/emoteshortcutconsts.h b/src/emoteshortcutconsts.h new file mode 100644 index 000000000..09c3451c4 --- /dev/null +++ b/src/emoteshortcutconsts.h @@ -0,0 +1,26 @@ +/* + * Extended support for activating emotes + * Copyright (C) 2011-2014 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 EMOTESHORTCUTCONSTS_H +#define EMOTESHORTCUTCONSTS_H + +static const int SHORTCUT_EMOTES = 48; + +#endif // EMOTESHORTCUTCONSTS_H diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 601101bef..eb46022ba 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -24,7 +24,7 @@ #include "configuration.h" #include "dragdrop.h" -#include "emoteshortcut.h" +#include "emoteshortcutconsts.h" #include "game.h" #include "inventory.h" #include "item.h" |