diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-03-04 00:14:15 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-03-04 00:14:15 +0300 |
commit | b9df78a88b4294cdaabd665dd4d88425aaaec3e9 (patch) | |
tree | 73522238d2c64491ea74b6bb03f8390726ac635a | |
parent | 7ef779a51bc4c3774d8a811b86b1ecb29decbda5 (diff) | |
download | plus-b9df78a88b4294cdaabd665dd4d88425aaaec3e9.tar.gz plus-b9df78a88b4294cdaabd665dd4d88425aaaec3e9.tar.bz2 plus-b9df78a88b4294cdaabd665dd4d88425aaaec3e9.tar.xz plus-b9df78a88b4294cdaabd665dd4d88425aaaec3e9.zip |
Move questtype enum into enums directory.
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/enums/resources/questtype.h (renamed from src/resources/questtype.h) | 0 | ||||
-rw-r--r-- | src/gui/windows/questswindow.cpp | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86f665f28..5ff6c39ac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -704,7 +704,7 @@ SET(SRCS resources/questeffect.h resources/questitem.h resources/questitemtext.h - resources/questtype.h + enums/resources/questtype.h resources/db/palettedb.cpp resources/db/palettedb.h resources/db/petdb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 5173c45f7..f8ea7be19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -370,7 +370,7 @@ SRC += events/actionevent.h \ resources/questeffect.h \ resources/questitem.h \ resources/questitemtext.h \ - resources/questtype.h \ + enums/resources/questtype.h \ resources/resource.cpp \ resources/resource.h \ resources/resourcemanager.cpp \ diff --git a/src/resources/questtype.h b/src/enums/resources/questtype.h index 62f4271c7..62f4271c7 100644 --- a/src/resources/questtype.h +++ b/src/enums/resources/questtype.h diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 8ca5276f0..5c57ca4eb 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -26,6 +26,8 @@ #include "being/localplayer.h" +#include "enums/resources/questtype.h" + #include "gui/gui.h" #include "gui/fonts/font.h" @@ -53,7 +55,6 @@ #include "resources/beingcommon.h" #include "resources/questeffect.h" #include "resources/questitem.h" -#include "resources/questtype.h" #include "resources/map/map.h" |