diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-08-15 17:50:36 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-08-15 17:50:36 +0300 |
commit | 54529fe6eb4de762fde160644b2ec365d1bf4db3 (patch) | |
tree | 854869d0a273fef8552477652366cf82163dc2f1 | |
parent | 8983972051cb5bc18c3e3dc40837b00f2e2caced (diff) | |
download | plus-54529fe6eb4de762fde160644b2ec365d1bf4db3.tar.gz plus-54529fe6eb4de762fde160644b2ec365d1bf4db3.tar.bz2 plus-54529fe6eb4de762fde160644b2ec365d1bf4db3.tar.xz plus-54529fe6eb4de762fde160644b2ec365d1bf4db3.zip |
Move itemsoundevent.h into item directory.
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/enums/resources/item/itemsoundevent.h (renamed from src/enums/resources/itemsoundevent.h) | 6 | ||||
-rw-r--r-- | src/itemsoundmanager.h | 2 | ||||
-rw-r--r-- | src/resources/soundinfo.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 20ffa9add..edd8ff803 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -676,7 +676,7 @@ SET(SRCS enums/resources/imageposition.h enums/resources/imagetype.h enums/resources/item/itemdbtype.h - enums/resources/itemsoundevent.h + enums/resources/item/itemsoundevent.h enums/resources/itemtype.h resources/itemtypemap.h resources/itemtypemapdata.h diff --git a/src/Makefile.am b/src/Makefile.am index 44c1141b2..0d9321152 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1286,7 +1286,7 @@ manaplus_SOURCES += main.cpp \ enums/resources/imageposition.h \ enums/resources/imagetype.h \ enums/resources/item/itemdbtype.h \ - enums/resources/itemsoundevent.h \ + enums/resources/item/itemsoundevent.h \ enums/resources/itemtype.h \ resources/itemtypemap.h \ resources/itemtypemapdata.h \ diff --git a/src/enums/resources/itemsoundevent.h b/src/enums/resources/item/itemsoundevent.h index 34589d85a..4ff4e21f1 100644 --- a/src/enums/resources/itemsoundevent.h +++ b/src/enums/resources/item/itemsoundevent.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ENUMS_RESOURCES_ITEMSOUNDEVENT_H -#define ENUMS_RESOURCES_ITEMSOUNDEVENT_H +#ifndef ENUMS_RESOURCES_ITEM_ITEMSOUNDEVENT_H +#define ENUMS_RESOURCES_ITEM_ITEMSOUNDEVENT_H namespace ItemSoundEvent { @@ -44,4 +44,4 @@ namespace ItemSoundEvent }; } // namespace ItemSoundEvent -#endif // ENUMS_RESOURCES_ITEMSOUNDEVENT_H +#endif // ENUMS_RESOURCES_ITEM_ITEMSOUNDEVENT_H diff --git a/src/itemsoundmanager.h b/src/itemsoundmanager.h index 37443b785..e1da2429a 100644 --- a/src/itemsoundmanager.h +++ b/src/itemsoundmanager.h @@ -21,7 +21,7 @@ #ifndef ITEMSOUNDMANAGER_H #define ITEMSOUNDMANAGER_H -#include "enums/resources/itemsoundevent.h" +#include "enums/resources/item/itemsoundevent.h" #include "localconsts.h" diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h index ac38bbf27..318cf53e6 100644 --- a/src/resources/soundinfo.h +++ b/src/resources/soundinfo.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_SOUNDINFO_H #define RESOURCES_SOUNDINFO_H -#include "enums/resources/itemsoundevent.h" +#include "enums/resources/item/itemsoundevent.h" #include <map> #include <string> |