fix a bug caused by exchanging "ready_for_start" <-> "ready_to_start"

wesnoth · Oct 12, 2014 · 788eb1b · 788eb1b
1 parent 6bc34b0
commit 788eb1b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/data/gui/default/window/lobby_sounds_options.cfg b/data/gui/default/window/lobby_sounds_options.cfg
@@ -176,7 +176,7 @@
 						{__GUI_LOBBY_SOUNDS_ENTRY "friend_message"  _"Friend message:"      _"When a message from a friend is recieved."}
 						{__GUI_LOBBY_SOUNDS_ENTRY "public_message"  _"Public message:"      _"When a public message is recieved."}
 						{__GUI_LOBBY_SOUNDS_ENTRY "server_message"  _"Server message:"      _"When a server message is recieved."}
-						{__GUI_LOBBY_SOUNDS_ENTRY "ready_to_start"  _"Ready to start game:" _"When the game you are hosting is ready to start."}
+						{__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."}
 
 					[/grid]

diff --git a/src/gui/dialogs/lobby_sounds_options.cpp b/src/gui/dialogs/lobby_sounds_options.cpp
@@ -129,7 +129,7 @@ void tlobby_sounds_options::pre_show(CVideo& /*video*/, twindow& window)
 	}
 
 	ttoggle_button * in_lobby;
-	in_lobby = &find_widget<ttoggle_button>(&window,"ready_to_start_in_lobby", false);
+	in_lobby = &find_widget<ttoggle_button>(&window,"ready_for_start_in_lobby", false);
 	in_lobby->set_visible(twidget::tvisible::invisible);
 
 	in_lobby = &find_widget<ttoggle_button>(&window,"game_has_begun_in_lobby", false);

diff --git a/src/mp_ui_sounds.cpp b/src/mp_ui_sounds.cpp
@@ -53,7 +53,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_to_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");
 
 void player_joins(bool is_lobby)
 {