create "turn_changed" preference under mp alerts

wesnoth · Oct 18, 2014 · 835da04 · 835da04
1 parent 304033e
commit 835da04
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/data/gui/default/window/mp_alerts_options.cfg b/data/gui/default/window/mp_alerts_options.cfg
@@ -179,6 +179,7 @@
 						{__GUI_LOBBY_SOUNDS_ENTRY "server_message"  _"Server message:"      _"When a server message is recieved"}
 						{__GUI_LOBBY_SOUNDS_ENTRY "ready_for_start"  _"Ready to start game:" _"When the game you are hosting is ready to start"}
 						{__GUI_LOBBY_SOUNDS_ENTRY "game_has_begun"  _"Game has begun:"      _"When the host (not you) has started the game"}
+						{__GUI_LOBBY_SOUNDS_ENTRY "turn_changed"  _"Turn changed:"      _"When a new turn has begun"}
 
 					[/grid]
 

diff --git a/src/gui/dialogs/mp_alerts_options.cpp b/src/gui/dialogs/mp_alerts_options.cpp
@@ -142,6 +142,12 @@ void tmp_alerts_options::pre_show(CVideo& /*video*/, twindow& window)
 	in_lobby = &find_widget<ttoggle_button>(&window,"game_has_begun_lobby", false);
 	in_lobby->set_visible(twidget::tvisible::invisible);
 
+	in_lobby = &find_widget<ttoggle_button>(&window,"turn_changed_sound", false); // If we get a sound for this then don't remove this button
+	in_lobby->set_visible(twidget::tvisible::invisible);
+
+	in_lobby = &find_widget<ttoggle_button>(&window,"turn_changed_lobby", false);
+	in_lobby->set_visible(twidget::tvisible::invisible);
+
 	tbutton * defaults;
 	defaults = &find_widget<tbutton>(&window,"revert_to_defaults", false);
 	connect_signal_mouse_left_click(*defaults, boost::bind(&revert_to_default_pref_values, boost::ref(window)));

diff --git a/src/mp_ui_alerts.cpp b/src/mp_ui_alerts.cpp
@@ -54,7 +54,7 @@ bool notif_pref(std::string id)
 } // end anonymous namespace
 
 // Note: This list must agree with data/gui/.../lobby_sound_options.cfg
-const std::vector<std::string> items = boost::assign::list_of("player_joins")("player_leaves")("private_message")("friend_message")("public_message")("server_message")("ready_for_start")("game_has_begun");
+const std::vector<std::string> items = boost::assign::list_of("player_joins")("player_leaves")("private_message")("friend_message")("public_message")("server_message")("ready_for_start")("game_has_begun")("turn_changed");
 
 void player_joins(bool is_lobby)
 {
@@ -166,17 +166,20 @@ void game_has_begun()
 
 void turn_changed(const std::string & player_name)
 {
-	utils::string_map player;
-	player["name"] = player_name;
-	desktop::notifications::send(_("Turn changed"), vgettext("$name has taken control", player), desktop::notifications::TURN_CHANGED);
+	std::string id = "turn_changed";
+	if (notif_pref(id)) {
+		utils::string_map player;
+		player["name"] = player_name;
+		desktop::notifications::send(_("Turn changed"), vgettext("$name has taken control", player), desktop::notifications::TURN_CHANGED);
+	}
 }
 
 bool get_def_pref_sound(const std::string & id) {
 	return (id != "public_message" && id != "friend_message");
 }
 
 bool get_def_pref_notif(const std::string & id) {
-	return (desktop::notifications::available() && (id == "private_message" || id == "ready_for_start" || id == "game_has_begun"));
+	return (desktop::notifications::available() && (id == "private_message" || id == "ready_for_start" || id == "game_has_begun" || id == "turn_changed"));
 }
 
 bool get_def_pref_lobby(const std::string & id) {