Permalink
Browse files

Merge pull request #85 from cbeck88/party-full-bell

Party full bell
  • Loading branch information...
2 parents b2b43a0 + a3dfc24 commit 11c038214e5a673ba6caf54513e6d4d28004da06 @shikadilord shikadilord committed Dec 12, 2013
Showing with 12 additions and 2 deletions.
  1. +3 −0 data/core/about.cfg
  2. +2 −1 src/game_config.cpp
  3. +1 −1 src/game_config.hpp
  4. +6 −0 src/multiplayer_connect.cpp
View
@@ -932,6 +932,9 @@
comment = "Poisoning improvement for Formula AI"
[/entry]
[entry]
+ name = "Chris Beck (iceiceice / involution)"
+ [/entry]
+ [entry]
name = "Chris Carpenter (mordocai)"
[/entry]
[entry]
View
@@ -151,7 +151,8 @@ namespace game_config
user_arrive = "arrive.wav",
user_leave = "leave.wav",
game_user_arrive = "join.wav",
- game_user_leave = "leave.wav";
+ game_user_leave = "leave.wav",
+ party_full_bell = "bell.wav";
const std::string button_press = "button.wav",
checkbox_release = "checkbox.wav",
View
@@ -142,7 +142,7 @@ namespace game_config
extern const std::string turn_bell, timer_bell, receive_message,
receive_message_highlight, receive_message_friend,
receive_message_server, user_arrive, user_leave,
- game_user_arrive, game_user_leave;
+ game_user_arrive, game_user_leave, party_full_bell;
extern const std::string button_press, checkbox_release, slider_adjust,
menu_expand, menu_contract, menu_select;
}
@@ -26,6 +26,7 @@
#include "log.hpp"
#include "map.hpp"
#include "wml_separators.hpp"
+#include "sound.hpp"
#include <boost/foreach.hpp>
@@ -580,6 +581,11 @@ void connect::update_playerlist_state(bool silent)
set_user_list(playerlist, silent);
set_user_menu_items(playerlist);
}
+
+ if (!silent && !engine_.sides_available() && engine_.can_start_game()) {
+ DBG_MP << "play party full sound" << std::endl;
+ sound::play_UI_sound(game_config::sounds::party_full_bell);
+ }
}
} // end namespace mp

0 comments on commit 11c0382

Please sign in to comment.