0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Chris Beck 2014-10-11 23:59:37 -04:00
parent 6bc34b03ef
commit 788eb1b240
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/gui/default/window/lobby_sounds_options.cfg
View file

@ -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]

2
src/gui/dialogs/lobby_sounds_options.cpp
View file

@ -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);

2
src/mp_ui_sounds.cpp
View file

@ -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)
{