From 54529fe6eb4de762fde160644b2ec365d1bf4db3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Aug 2016 17:50:36 +0300 Subject: Move itemsoundevent.h into item directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/resources/item/itemsoundevent.h | 47 +++++++++++++++++++++++++++++++ src/enums/resources/itemsoundevent.h | 47 ------------------------------- src/itemsoundmanager.h | 2 +- src/resources/soundinfo.h | 2 +- 6 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 src/enums/resources/item/itemsoundevent.h delete mode 100644 src/enums/resources/itemsoundevent.h 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/item/itemsoundevent.h b/src/enums/resources/item/itemsoundevent.h new file mode 100644 index 000000000..4ff4e21f1 --- /dev/null +++ b/src/enums/resources/item/itemsoundevent.h @@ -0,0 +1,47 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2016 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 ENUMS_RESOURCES_ITEM_ITEMSOUNDEVENT_H +#define ENUMS_RESOURCES_ITEM_ITEMSOUNDEVENT_H + +namespace ItemSoundEvent +{ + enum Type + { + HIT = 0, + MISS, + HURT, + DIE, + MOVE, + SIT, + SITTOP, + SPAWN, + DROP, + PICKUP, + TAKE, // take from container + PUT, // put into container + EQUIP, + UNEQUIP, + USE, + USECARD + }; +} // namespace ItemSoundEvent + +#endif // ENUMS_RESOURCES_ITEM_ITEMSOUNDEVENT_H diff --git a/src/enums/resources/itemsoundevent.h b/src/enums/resources/itemsoundevent.h deleted file mode 100644 index 34589d85a..000000000 --- a/src/enums/resources/itemsoundevent.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-2016 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 ENUMS_RESOURCES_ITEMSOUNDEVENT_H -#define ENUMS_RESOURCES_ITEMSOUNDEVENT_H - -namespace ItemSoundEvent -{ - enum Type - { - HIT = 0, - MISS, - HURT, - DIE, - MOVE, - SIT, - SITTOP, - SPAWN, - DROP, - PICKUP, - TAKE, // take from container - PUT, // put into container - EQUIP, - UNEQUIP, - USE, - USECARD - }; -} // namespace ItemSoundEvent - -#endif // ENUMS_RESOURCES_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 #include -- cgit v1.2.3-60-g2f50