diff options
-rw-r--r-- | developer/ROADMAP | 3 | ||||
-rw-r--r-- | src/client/playerview.cc | 6 | ||||
-rw-r--r-- | src/client/targeticonbutton.cc | 2 | ||||
-rw-r--r-- | src/ui/button.cc | 4 | ||||
-rw-r--r-- | src/ui/iconbutton.cc | 7 | ||||
-rw-r--r-- | src/ui/listitem.cc | 7 | ||||
-rw-r--r-- | src/ui/ui.cc | 2 |
7 files changed, 14 insertions, 17 deletions
diff --git a/developer/ROADMAP b/developer/ROADMAP index 98620ee..1599ceb 100644 --- a/developer/ROADMAP +++ b/developer/ROADMAP @@ -103,9 +103,10 @@ collision physics (ok) collision meshes (ok) dockable player ships (ok) + zone chat (ok) player saving and network authentication - zone chat + ------------------------------------------------------------------ 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; } diff --git a/src/ui/button.cc b/src/ui/button.cc index 6cbb51e..9e07c09 100644 --- a/src/ui/button.cc +++ b/src/ui/button.cc @@ -88,7 +88,7 @@ bool Button::on_keypress(const int key, const unsigned int modifier) if (button_command.size()) { core::cmd() << button_command << std::endl; } - audio::play("ui/button"); + audio::play("ui/clicked"); emit(EventButtonClicked); } @@ -106,7 +106,7 @@ bool Button::on_keyrelease(const int key, const unsigned int modifier) void Button::on_mouseover(const math::Vector2f &cursor) { if (enabled()) { - audio::play("ui/select"); + //audio::play("ui/select"); } } diff --git a/src/ui/iconbutton.cc b/src/ui/iconbutton.cc index 5f16e71..83c7aa7 100644 --- a/src/ui/iconbutton.cc +++ b/src/ui/iconbutton.cc @@ -105,7 +105,7 @@ bool IconButton::on_keypress(const int key, const unsigned int modifier) if (iconbutton_command.size()) { core::cmd() << iconbutton_command << std::endl; } - audio::play("ui/button"); + audio::play("ui/clicked"); emit(EventButtonClicked); } return true; @@ -121,8 +121,9 @@ bool IconButton::on_keyrelease(const int key, const unsigned int modifier) void IconButton::on_mouseover(const math::Vector2f &cursor) { - if (enabled()) - audio::play("ui/select"); + if (enabled()) { + //audio::play("ui/select"); + } } } diff --git a/src/ui/listitem.cc b/src/ui/listitem.cc index 8702757..8f445f1 100644 --- a/src/ui/listitem.cc +++ b/src/ui/listitem.cc @@ -53,14 +53,15 @@ void ListItem::draw() void ListItem::on_mouseover(const math::Vector2f &cursor) { - if (enabled()) - audio::play("ui/select"); + if (enabled()) { + //audio::play("ui/select"); + } } bool ListItem::on_keypress(const int key, const unsigned int modifier) { if (key == 512 + SDL_BUTTON_LEFT) { - audio::play("ui/button"); + //audio::play("ui/button"); emit(EventListItemClicked); diff --git a/src/ui/ui.cc b/src/ui/ui.cc index de881cb..a5ef883 100644 --- a/src/ui/ui.cc +++ b/src/ui/ui.cc @@ -530,7 +530,7 @@ bool UI::on_keypress(const int key, const unsigned int modifier) case SDLK_ESCAPE: if (active()) { hide_menu(); - audio::play("ui/menu"); + //audio::play("ui/menu"); } return true; break; |