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

Also require observers to enter a game's password.

Browse source 
Current situation:
* All observers allowed (Observers checked).
* No observers allowed (Observers unchecked).

New situation:
* All observers allowed (Observers checked, no password set).
* Some observers allowed (Observers checked, password set).
* No observers allowed (Observers unchecked).
This commit is contained in:
Pentarctagon 2019-06-28 13:46:38 -05:00 • committed by Gunter Labes
parent b700678c35
commit 4ac5d96182
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.md
View file

@ -66,6 +66,7 @@
* Don't show in the sidebar the time of day schedule of a shrouded hex. (issue #3638)
* Make unit_weapons report display weapon specials as active/inactive correctly. (issue #4071)
* macOS: Dark GUI on macOS Mojave and later when dark appearance is enabled.
* Observers are now required to enter a game's password as well, rather than just players needing to enter the password.
### Packaging
* OpenMP support has been removed. It is no longer an optional build-time dependency.
### Units

2
src/gui/dialogs/multiplayer/lobby.cpp
View file

@ -968,7 +968,7 @@ void mp_lobby::enter_game(const mp::game_info& game, JOIN_MODE mode)
join_data["id"] = std::to_string(game.id);
join_data["observe"] = try_obsv;
if(!join_data.empty() && try_join && game.password_required) {
if(!join_data.empty() && game.password_required) {
std::string password;
if(!gui2::dialogs::mp_join_game_password_prompt::execute(password)) {

2
src/server/server.cpp
View file

@ -1462,7 +1462,7 @@ void server::handle_join_game(socket_ptr socket, simple_wml::node& join)
send_server_message(socket, "You are banned from this game.");
async_send_doc(socket, games_and_users_list_);
return;
} else if(!observer && !g->password_matches(password)) {
} else if(!g->password_matches(password)) {
WRN_SERVER << client_address(socket) << "\t" << player_connections_.find(socket)->info().name()
<< "\tattempted to join game:\t\"" << g->name() << "\" (" << game_id << ") with bad password\n";
async_send_doc(socket, leave_game_doc);