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

Merge pull request #5196 from Vultraz/remove_registered_users_only

Browse source 
Removed Registered Users Only game config option (resolves #4980)
This commit is contained in:
Charles Dang 2020-10-09 11:32:08 +11:00 • committed by GitHub
commit af344d21a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 6 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/gui/window/mp_create_game.cfg
View file

@ -933,10 +933,6 @@
{_GUI_MP_CREATE_MAIN_TOGGLE "observers" _"Observers" _"Allow users who are not playing to watch the game"}
#enddef
#define _GUI_MP_CREATE_REGISTERED_TOGGLE
{_GUI_MP_CREATE_MAIN_TOGGLE "registered_users" _"Registered Users Only" _"Allow only registered users to join the game"}
#enddef
#define _GUI_MP_CREATE_SYNC_TOGGLE
{_GUI_MP_CREATE_MAIN_TOGGLE "strict_sync" _"Strict Synchronization" _"Stricter checks for out-of-sync errors"}
#enddef
@ -1085,6 +1081,5 @@
#undef _GUI_MP_CREATE_MAIN_TOGGLE
#undef _GUI_MP_CREATE_SHUFFLE_TOGGLE
#undef _GUI_MP_CREATE_OBSERVER_TOGGLE
#undef _GUI_MP_CREATE_REGISTERED_TOGGLE
#undef _GUI_MP_CREATE_SYNC_TOGGLE
#undef _GUI_MP_CREATE_PRIVATE_TOGGLE

4
data/gui/window/mp_create_game/default_resolution.cfg
View file

@ -314,10 +314,6 @@
{_GUI_MP_CREATE_OBSERVER_TOGGLE}
[/row]
[row]
{_GUI_MP_CREATE_REGISTERED_TOGGLE}
[/row]
[row]
{_GUI_MP_CREATE_SYNC_TOGGLE}
[/row]

2
data/gui/window/mp_create_game/small_resolution.cfg
View file

@ -88,8 +88,6 @@
[row]
{_GUI_MP_CREATE_REGISTERED_TOGGLE}
{_GUI_MP_CREATE_SYNC_TOGGLE}
[/row]

2
data/gui/window/mp_create_game/tiny_resolution.cfg
View file

@ -253,8 +253,6 @@
horizontal_grow = true
[grid]
[row]
{_GUI_MP_CREATE_REGISTERED_TOGGLE}
{_GUI_MP_CREATE_SYNC_TOGGLE}
[/row]
[/grid]

2
src/addon/manager.cpp
View file

@ -169,7 +169,7 @@ std::map<std::string, std::string> installed_addons_and_versions()
if(have_addon_pbl_info(addon_id)) {
try {
addons[addon_id] = get_addon_pbl_info(addon_id)["version"].str();
} catch(const invalid_pbl_exception& e) {
} catch(const invalid_pbl_exception&) {
addons[addon_id] = "Invalid pbl file, version unknown";
}
} else if(filesystem::file_exists(get_info_file_path(addon_id))) {

5
src/game_initialization/configure_engine.cpp
View file

@ -144,11 +144,6 @@ bool configure_engine::allow_observers_default() const
return preferences::allow_observers();
}
bool configure_engine::registered_users_only_default() const
{
return preferences::registered_users_only();
}
bool configure_engine::shuffle_sides_default() const
{
return preferences::shuffle_sides();

11
src/game_initialization/configure_engine.hpp
View file

@ -116,11 +116,6 @@ public:
return parameters_.allow_observers;
}
bool registered_users_only() const
{
return parameters_.registered_users_only;
}
bool shuffle_sides() const
{
return parameters_.shuffle_sides;
@ -220,11 +215,6 @@ public:
parameters_.allow_observers = val;
}
void set_registered_users_only(bool val)
{
parameters_.registered_users_only = val;
}
void set_private_replay(bool val)
{
parameters_.private_replay = val;
@ -266,7 +256,6 @@ public:
bool fog_game_default() const;
bool shroud_game_default() const;
bool allow_observers_default() const;
bool registered_users_only_default() const;
bool shuffle_sides_default() const;
mp_game_settings::RANDOM_FACTION_MODE random_faction_mode_default() const;
const config& options_default() const;

1
src/game_initialization/lobby_data.cpp
View file

@ -198,7 +198,6 @@ game_info::game_info(const config& game, const std::vector<std::string>& install
, observers(game["observer"].to_bool(true))
, shuffle_sides(game["shuffle_sides"].to_bool(true))
, use_map_settings(game["mp_use_map_settings"].to_bool())
, registered_users_only(game["registered_users_only"].to_bool())
, private_replay(game["private_replay"].to_bool())
, verified(true)
, password_required(game["password"].to_bool())

1
src/game_initialization/lobby_data.hpp
View file

@ -170,7 +170,6 @@ struct game_info
bool observers;
bool shuffle_sides;
bool use_map_settings;
bool registered_users_only;
bool private_replay;
bool verified;
bool password_required;

3
src/game_initialization/multiplayer.cpp
View file

@ -502,9 +502,8 @@ void enter_create_mode(mp_workflow_helper_ptr helper)
bool dlg_ok = false;
{
bool local_mode = helper->connection == nullptr;
mp::user_info* host_info = helper->lobby_info->get_user(preferences::login());
gui2::dialogs::mp_create_game dlg(helper->game_config, helper->state, local_mode, host_info);
gui2::dialogs::mp_create_game dlg(helper->game_config, helper->state, local_mode);
dlg.show();
// The Create Game dialog also has a LOAD_GAME retval besides OK.

11
src/gui/dialogs/multiplayer/mp_create_game.cpp
View file

@ -68,7 +68,7 @@ namespace prefs = preferences;
REGISTER_DIALOG(mp_create_game)
mp_create_game::mp_create_game(const game_config_view& cfg, saved_game& state, bool local_mode, mp::user_info* host_info)
mp_create_game::mp_create_game(const game_config_view& cfg, saved_game& state, bool local_mode)
: cfg_(cfg)
, create_engine_(state)
, config_engine_()
@ -84,7 +84,6 @@ mp_create_game::mp_create_game(const game_config_view& cfg, saved_game& state, b
std::bind(&mp_create_game::update_map_settings, this)))
, shuffle_sides_(register_bool("shuffle_sides", true, prefs::shuffle_sides, prefs::set_shuffle_sides))
, observers_(register_bool("observers", true, prefs::allow_observers, prefs::set_allow_observers))
, registered_users_(register_bool("registered_users", true, prefs::registered_users_only, prefs::set_registered_users_only))
, strict_sync_(register_bool("strict_sync", true))
, private_replay_(register_bool("private_replay", true))
, turns_(register_integer("turn_count", true, prefs::turns, prefs::set_turns))
@ -98,7 +97,6 @@ mp_create_game::mp_create_game(const game_config_view& cfg, saved_game& state, b
, mod_list_()
, eras_menu_button_()
, local_mode_(local_mode)
, host_info_(host_info)
{
level_types_ = {
{ng::level::TYPE::SCENARIO, _("Scenarios")},
@ -311,11 +309,6 @@ void mp_create_game::pre_show(window& win)
// Disable certain settings if we're playing a local game.
//
// Don't allow a 'registered users only' game if the host themselves isn't registered.
if(local_mode_ || (host_info_ && !host_info_->registered)) {
registered_users_->widget_set_enabled(win, false, false);
}
if(local_mode_) {
find_widget<text_box>(&win, "game_name", false).set_active(false);
find_widget<text_box>(&win, "game_password", false).set_active(false);
@ -382,7 +375,6 @@ void mp_create_game::pre_show(window& win)
UPDATE_ATTRIBUTE(reservoir, to_int);
UPDATE_ATTRIBUTE(action_bonus, to_int);
UPDATE_ATTRIBUTE(observers, to_bool);
UPDATE_ATTRIBUTE(registered_users, to_bool);
UPDATE_ATTRIBUTE(strict_sync, to_bool);
UPDATE_ATTRIBUTE(private_replay, to_bool);
UPDATE_ATTRIBUTE(shuffle_sides, to_bool);
@ -943,7 +935,6 @@ void mp_create_game::post_show(window& window)
config_engine_->set_mp_countdown_action_bonus(action_bonus_->get_widget_value(window));
config_engine_->set_allow_observers(observers_->get_widget_value(window));
config_engine_->set_registered_users_only(registered_users_->get_widget_value(window));
config_engine_->set_private_replay(private_replay_->get_widget_value(window));
config_engine_->set_oos_debug(strict_sync_->get_widget_value(window));
config_engine_->set_shuffle_sides(shuffle_sides_->get_widget_value(window));

10
src/gui/dialogs/multiplayer/mp_create_game.hpp
View file

@ -26,11 +26,6 @@
class config;
class game_config_view;
namespace mp
{
struct user_info;
}
namespace gui2
{
class toggle_button;
@ -45,7 +40,7 @@ class mp_create_game : public modal_dialog, private plugin_executor
typedef std::pair<ng::level::TYPE, std::string> level_type_info;
public:
mp_create_game(const game_config_view& cfg, saved_game& state, bool local_mode, mp::user_info* host_info = nullptr);
mp_create_game(const game_config_view& cfg, saved_game& state, bool local_mode);
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
@ -101,7 +96,6 @@ private:
field_bool* time_limit_;
field_bool* shuffle_sides_;
field_bool* observers_;
field_bool* registered_users_;
field_bool* strict_sync_;
field_bool* private_replay_;
@ -119,8 +113,6 @@ private:
bool local_mode_;
mp::user_info* host_info_;
template<typename widget>
void on_filter_change(window& window, const std::string& id, bool do_select);

3
src/mp_game_settings.cpp
View file

@ -51,7 +51,6 @@ mp_game_settings::mp_game_settings() :
fog_game(false),
shroud_game(false),
allow_observers(true),
registered_users_only(false),
private_replay(false),
shuffle_sides(false),
saved_game(SAVED_GAME_MODE::NONE),
@ -83,7 +82,6 @@ mp_game_settings::mp_game_settings(const config& cfg)
, fog_game(cfg["mp_fog"].to_bool())
, shroud_game(cfg["mp_shroud"].to_bool())
, allow_observers(cfg["observer"].to_bool())
, registered_users_only(cfg["registered_users_only"].to_bool())
, private_replay(cfg["private_replay"].to_bool())
, shuffle_sides(cfg["shuffle_sides"].to_bool())
, saved_game(cfg["savegame"].to_enum<SAVED_GAME_MODE>(SAVED_GAME_MODE::NONE))
@ -123,7 +121,6 @@ config mp_game_settings::to_config() const
cfg["mp_use_map_settings"] = use_map_settings;
cfg["mp_random_start_time"] = random_start_time;
cfg["observer"] = allow_observers;
cfg["registered_users_only"] = registered_users_only;
cfg["private_replay"] = private_replay;
cfg["shuffle_sides"] = shuffle_sides;
cfg["random_faction_mode"] = random_faction_mode;

1
src/mp_game_settings.hpp
View file

@ -55,7 +55,6 @@ struct mp_game_settings
bool fog_game;
bool shroud_game;
bool allow_observers;
bool registered_users_only;
bool private_replay;
bool shuffle_sides;

10
src/preferences/game.cpp
View file

@ -484,16 +484,6 @@ void set_allow_observers(bool value)
preferences::set("allow_observers", value);
}
bool registered_users_only()
{
return preferences::get("registered_users_only", false);
}
void set_registered_users_only(bool value)
{
preferences::set("registered_users_only", value);
}
bool shuffle_sides()
{
return preferences::get("shuffle_sides", false);

3
src/preferences/game.hpp
View file

@ -98,9 +98,6 @@ class acquaintance;
bool allow_observers();
void set_allow_observers(bool value);
bool registered_users_only();
void set_registered_users_only(bool value);
bool shuffle_sides();
void set_shuffle_sides(bool value);

5
src/server/wesnothd/game.cpp
View file

@ -170,11 +170,6 @@ bool game::allow_observers() const
return get_multiplayer(level_.root())["observer"].to_bool(true);
}
bool game::registered_users_only() const
{
return get_multiplayer(level_.root())["registered_users_only"].to_bool(true);
}
bool game::is_observer(const socket_ptr& player) const
{
return std::find(observers_.begin(), observers_.end(), player) != observers_.end();

1
src/server/wesnothd/game.hpp
View file

@ -80,7 +80,6 @@ public:
}
bool allow_observers() const;
bool registered_users_only() const;
bool is_observer(const socket_ptr& player) const;
bool is_player(const socket_ptr& player) const;

7
src/server/wesnothd/server.cpp
View file

@ -711,7 +711,7 @@ bool server::is_login_allowed(socket_ptr socket, const simple_wml::node* const l
if(utils::wildcard_string_match(utf8::lowercase(username), utf8::lowercase(d))) {
async_send_error(socket, "The nickname '" + username + "' is reserved and cannot be used by players",
MP_NAME_RESERVED_ERROR);
return false;
}
}
@ -1389,11 +1389,6 @@ void server::handle_join_game(socket_ptr socket, simple_wml::node& join)
return;
} else if(player_connections_.find(socket)->info().is_moderator()) {
// Admins are always allowed to join.
} else if(g->registered_users_only() && !player_connections_.find(socket)->info().registered()) {
async_send_doc_queued(socket, leave_game_doc);
send_server_message(socket, "Only registered users are allowed to join this game.", "error");
async_send_doc_queued(socket, games_and_users_list_);
return;
} else if(g->player_is_banned(socket, player_connections_.find(socket)->info().name())) {
DBG_SERVER << client_address(socket)
<< "\tReject banned player: " << player_connections_.find(socket)->info().name()

2
src/tests/gui/test_gui2.cpp
View file

@ -907,7 +907,7 @@ struct dialog_tester<mp_create_game>
}
mp_create_game* create()
{
return new mp_create_game(game_config_view_, state, true, nullptr);
return new mp_create_game(game_config_view_, state, true);
}
};