diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/actions/actions.cpp | 3 | ||||
| -rw-r--r-- | src/const/resources/skill.h (renamed from src/resources/skillconsts.h) | 6 | ||||
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/skilllistbox.h | 2 | ||||
| -rw-r--r-- | src/itemshortcut.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/questrecv.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/questrecv.cpp | 2 |
9 files changed, 12 insertions, 11 deletions
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/resources/skillconsts.h b/src/const/resources/skill.h index fe0ef1658..9db0dbc0e 100644 --- a/src/resources/skillconsts.h +++ b/src/const/resources/skill.h @@ -18,10 +18,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_SKILLCONSTS_H -#define RESOURCES_SKILLCONSTS_H +#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 // RESOURCES_SKILLCONSTS_H +#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" |