Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-02-10 18:20:46 +0000
committerStijn Buys <ingar@osirion.org>2011-02-10 18:20:46 +0000
commita012d56b0f230114de0e9b10e15023faa3c8a44c (patch)
tree95b78f86a0f78f34ab47d442ac9a6617c3ec528c /src/client
parent9ff5cf6184b9c5183c1f55cfa6c0d08586eb02c9 (diff)
Sanitized ui sounds, removed button hover sound.
Diffstat (limited to 'src/client')
-rw-r--r--src/client/playerview.cc6
-rw-r--r--src/client/targeticonbutton.cc2
2 files changed, 1 insertions, 7 deletions
diff --git a/src/client/playerview.cc b/src/client/playerview.cc
index e942924..d5026ef 100644
--- a/src/client/playerview.cc
+++ b/src/client/playerview.cc
@@ -9,7 +9,6 @@
#include "core/info.h"
#include "core/application.h"
-#include "audio/audio.h"
#include "ui/ui.h"
#include "client/targeticonbutton.h"
#include "client/playerview.h"
@@ -102,7 +101,6 @@ void PlayerView::toggle_map()
}
map()->toggle();
- audio::play("ui/menu");
/* if (map()->visible() && chat()->visible() && chat()->small_view()) {
chat()->raise();
@@ -136,7 +134,6 @@ void PlayerView::toggle_inventory()
}
inventory()->toggle();
- audio::play("ui/menu");
/* if (inventory()->visible() && chat()->visible() && chat()->small_view()) {
chat()->raise();
@@ -173,7 +170,6 @@ void PlayerView::toggle_chat()
chat()->set_small_view(false);
chat()->toggle();
- audio::play("ui/menu");
}
void PlayerView::toggle_chatbar()
@@ -348,7 +344,6 @@ void PlayerView::draw()
show_menu("main");
map()->hide();
chat()->hide();
- audio::play("ui/menu");
// hide other windows
view_chat->hide();
@@ -360,7 +355,6 @@ void PlayerView::draw()
// show the menu if there's no other window open
view_entitymenu->show();
- audio::play("ui/menu");
}
view_notify->set_size(width() - smallmargin * 3.0f - ui::UI::elementsize.width() * 1.5f, height() - smallmargin * 4.0f);
diff --git a/src/client/targeticonbutton.cc b/src/client/targeticonbutton.cc
index 1ef2da0..afc3838 100644
--- a/src/client/targeticonbutton.cc
+++ b/src/client/targeticonbutton.cc
@@ -23,7 +23,7 @@ bool TargetIconButton::on_keypress(const int key, const unsigned int modifier)
if (key == 512 + SDL_BUTTON_LEFT) {
if (enabled() && command().size() && targets::current()) {
core::cmd() << "@" << command() << " " << targets::current_id() << std::endl;
- audio::play("ui/button");
+ audio::play("ui/clicked");
}
return true;
}