From 0efc9d93b7ef5e3a9169b2a68a1f655a0fd9979f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 14 Dec 2015 02:19:35 +0300 Subject: Move skillconsts from resources int consts directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/actions/actions.cpp | 3 ++- src/const/resources/skill.h | 27 +++++++++++++++++++++++++++ src/gui/widgets/itemshortcutcontainer.cpp | 2 +- src/gui/widgets/skilllistbox.h | 2 +- src/itemshortcut.cpp | 2 +- src/net/eathena/questrecv.cpp | 2 +- src/net/tmwa/questrecv.cpp | 2 +- src/resources/skillconsts.h | 27 --------------------------- 10 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 src/const/resources/skill.h delete mode 100644 src/resources/skillconsts.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 111a6bb0d..70be80062 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -711,7 +711,7 @@ SET(SRCS resources/sdlimagehelper.h resources/sdlmusic.cpp resources/sdlmusic.h - resources/skillconsts.h + const/resources/skill.h resources/skillowner.h resources/skilltype.h resources/db/sounddb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index c542a4a57..6b14c9b0e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -365,7 +365,7 @@ SRC += events/actionevent.h \ resources/sdlimagehelper.h \ resources/sdlmusic.cpp \ resources/sdlmusic.h \ - resources/skillconsts.h \ + const/resources/skill.h \ resources/skillowner.h \ resources/skilltype.h \ resources/soundeffect.cpp \ diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index a1f19eb32..663c7d475 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -95,7 +95,8 @@ #include "resources/iteminfo.h" #include "resources/resourcemanager.h" -#include "resources/skillconsts.h" + +#include "const/resources/skill.h" #include "utils/chatutils.h" #include "utils/delete2.h" diff --git a/src/const/resources/skill.h b/src/const/resources/skill.h new file mode 100644 index 000000000..9db0dbc0e --- /dev/null +++ b/src/const/resources/skill.h @@ -0,0 +1,27 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2015 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 CONST_RESOURCES_SKILL_H +#define CONST_RESOURCES_SKILL_H + +const int SKILL_MIN_ID = 200000; +const unsigned int SKILL_VAR_MIN_ID = 1000000; + +#endif // CONST_RESOURCES_SKILL_H diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 4e14fa8c5..4bcc5cd80 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -48,7 +48,7 @@ #include "input/inputactionoperators.h" -#include "resources/skillconsts.h" +#include "const/resources/skill.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h index 20cc8d885..f1a8de8be 100644 --- a/src/gui/widgets/skilllistbox.h +++ b/src/gui/widgets/skilllistbox.h @@ -39,7 +39,7 @@ #include "utils/delete2.h" -#include "resources/skillconsts.h" +#include "const/resources/skill.h" #include "localconsts.h" diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index 5d11ae148..f1ef56993 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -33,7 +33,7 @@ #include "gui/windows/skilldialog.h" -#include "resources/skillconsts.h" +#include "const/resources/skill.h" #include "debug.h" diff --git a/src/net/eathena/questrecv.cpp b/src/net/eathena/questrecv.cpp index e2af6cc6b..e029e020e 100644 --- a/src/net/eathena/questrecv.cpp +++ b/src/net/eathena/questrecv.cpp @@ -25,7 +25,7 @@ #include "net/messagein.h" -#include "resources/skillconsts.h" +#include "const/resources/skill.h" #include "debug.h" diff --git a/src/net/tmwa/questrecv.cpp b/src/net/tmwa/questrecv.cpp index f95a7463a..3a9a49747 100644 --- a/src/net/tmwa/questrecv.cpp +++ b/src/net/tmwa/questrecv.cpp @@ -25,7 +25,7 @@ #include "net/messagein.h" -#include "resources/skillconsts.h" +#include "const/resources/skill.h" #include "debug.h" diff --git a/src/resources/skillconsts.h b/src/resources/skillconsts.h deleted file mode 100644 index fe0ef1658..000000000 --- a/src/resources/skillconsts.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2015 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 RESOURCES_SKILLCONSTS_H -#define RESOURCES_SKILLCONSTS_H - -const int SKILL_MIN_ID = 200000; -const unsigned int SKILL_VAR_MIN_ID = 1000000; - -#endif // RESOURCES_SKILLCONSTS_H -- cgit v1.2.3-60-g2f50