summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-20 18:41:28 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-20 18:41:28 +0300
commite50c6b9fbcd7713b990012f17665efeb2a284dd2 (patch)
tree7c20ed735fc652c9f04a6e9b4aaa3375c9d458b1
parentaf04f2dba2ba62b5e245e1151c5bfaf95f1e2b37 (diff)
downloadmanaplus-e50c6b9fbcd7713b990012f17665efeb2a284dd2.tar.gz
manaplus-e50c6b9fbcd7713b990012f17665efeb2a284dd2.tar.bz2
manaplus-e50c6b9fbcd7713b990012f17665efeb2a284dd2.tar.xz
manaplus-e50c6b9fbcd7713b990012f17665efeb2a284dd2.zip
Remove unused defaults for attack sounds.
-rw-r--r--src/defaults.cpp2
-rw-r--r--src/localplayer.cpp14
2 files changed, 0 insertions, 16 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index f70788eca..3e367db8b 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -398,8 +398,6 @@ DefaultsData* getPathsDefaults()
AddDEF("maps", "maps/");
AddDEF("sfx", "sfx/");
- AddDEF("attackSfxFile", "fist-swish.ogg");
- AddDEF("missSfxFile", "fist-swish.ogg");
AddDEF("music", "music/");
AddDEF("wallpapers", "graphics/images/");
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index d19a79eae..6546d31bd 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -1300,20 +1300,6 @@ void LocalPlayer::attack(Being *const target, const bool keep,
{
setAction(ATTACK);
-/*
- if (mEquippedWeapon)
- {
- std::string soundFile = mEquippedWeapon->getSound(
- EQUIP_EVENT_STRIKE);
- if (!soundFile.empty())
- soundManager.playSfx(soundFile);
- }
- else
- {
- soundManager.playSfx(paths.getValue(
- "attackSfxFile", "fist-swish.ogg"));
- }
-*/
if (!Client::limitPackets(PACKET_ATTACK))
return;