diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-15 17:15:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-15 17:15:39 +0300 |
| commit | 58c6a03a6672a1f70c694e56da539930f22c8cdd (patch) | |
| tree | a27a3f0833c585fea09240f57a51fc14abd809cf | |
| parent | b1fab9807bc9fc72573da82e42920ac14e7e4e6c (diff) | |
| download | mv-58c6a03a6672a1f70c694e56da539930f22c8cdd.tar.gz mv-58c6a03a6672a1f70c694e56da539930f22c8cdd.tar.bz2 mv-58c6a03a6672a1f70c694e56da539930f22c8cdd.tar.xz mv-58c6a03a6672a1f70c694e56da539930f22c8cdd.zip | |
Move skillowner.h into skill directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/enums/resources/skill/skillowner.h (renamed from src/enums/resources/skillowner.h) | 6 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.h | 2 | ||||
| -rw-r--r-- | src/resources/skill/skillinfo.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f3e2ce39..11c522a65 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -780,7 +780,7 @@ SET(SRCS resources/skill/skilltypelist.h const/net/skill.h const/resources/skill.h - enums/resources/skillowner.h + enums/resources/skill/skillowner.h enums/resources/skilltype.h enums/resources/skilltype2.h resources/db/sounddb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 20644b120..92da6e31d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -444,7 +444,7 @@ SRC += events/actionevent.h \ resources/skill/skilltypelist.h \ const/net/skill.h \ const/resources/skill.h \ - enums/resources/skillowner.h \ + enums/resources/skill/skillowner.h \ enums/resources/skilltype.h \ enums/resources/skilltype2.h \ resources/soundeffect.cpp \ diff --git a/src/enums/resources/skillowner.h b/src/enums/resources/skill/skillowner.h index 30301b423..c82e42dbb 100644 --- a/src/enums/resources/skillowner.h +++ b/src/enums/resources/skill/skillowner.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ENUMS_RESOURCES_SKILLOWNER_H -#define ENUMS_RESOURCES_SKILLOWNER_H +#ifndef ENUMS_RESOURCES_SKILL_SKILLOWNER_H +#define ENUMS_RESOURCES_SKILL_SKILLOWNER_H namespace SkillOwner { @@ -32,4 +32,4 @@ namespace SkillOwner }; } // namespace SkillOwner -#endif // ENUMS_RESOURCES_SKILLOWNER_H +#endif // ENUMS_RESOURCES_SKILL_SKILLOWNER_H diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 59981c403..db18087c5 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -28,10 +28,10 @@ #include "enums/simpletypes/autotarget.h" #include "enums/simpletypes/modifiable.h" -#include "enums/resources/skillowner.h" #include "enums/resources/skilltype.h" #include "enums/resources/skill/casttype.h" +#include "enums/resources/skill/skillowner.h" #include "listeners/actionlistener.h" diff --git a/src/resources/skill/skillinfo.h b/src/resources/skill/skillinfo.h index b49d79e2c..7f50e03ce 100644 --- a/src/resources/skill/skillinfo.h +++ b/src/resources/skill/skillinfo.h @@ -26,10 +26,10 @@ #include "enums/simpletypes/modifiable.h" #include "enums/simpletypes/visible.h" -#include "enums/resources/skillowner.h" #include "enums/resources/skilltype.h" #include "enums/resources/skill/casttype.h" +#include "enums/resources/skill/skillowner.h" #include <string> #include <vector> |