summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/itemsoundevent.h46
-rw-r--r--src/resources/soundinfo.h2
2 files changed, 1 insertions, 47 deletions
diff --git a/src/resources/itemsoundevent.h b/src/resources/itemsoundevent.h
deleted file mode 100644
index 0f3b36b94..000000000
--- a/src/resources/itemsoundevent.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2013-2015 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_ITEMSOUNDEVENT_H
-#define 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
- };
-} // namespace ItemSoundEvent
-
-#endif // RESOURCES_ITEMSOUNDEVENT_H
diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h
index 15a9dd030..80aef407c 100644
--- a/src/resources/soundinfo.h
+++ b/src/resources/soundinfo.h
@@ -21,7 +21,7 @@
#ifndef RESOURCES_SOUNDINFO_H
#define RESOURCES_SOUNDINFO_H
-#include "resources/itemsoundevent.h"
+#include "enums/resources/itemsoundevent.h"
#include <map>
#include <string>