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

don't assign computer sides to new players

Browse source 
seems like that part of bug https://gna.org/bugs/?22968 effected 1.13 too.
This commit is contained in:
gfgtdf 2015-01-08 15:41:30 +01:00
parent e2a52ee0cb
commit db5f6daec3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game_initialization/connect_engine.cpp
View file

@ -247,7 +247,7 @@ void connect_engine::import_user(const config& data, const bool observer,
// Check if user has a side(s) reserved for him.
BOOST_FOREACH(side_engine_ptr side, side_engines_) {
if (side->reserved_for() == username && side->player_id().empty()) {
if (side->reserved_for() == username && side->player_id().empty() && side->controller() != CNTR_COMPUTER) {
side->place_user(data);
side_assigned = true;
@ -793,7 +793,7 @@ void connect_engine::load_previous_sides_users(LOAD_USERS load_users)
if (side_users.find(save_id) != side_users.end()) {
side->set_reserved_for(side_users[save_id]);
if (load_users == RESERVE_USERS) {
if (load_users == RESERVE_USERS && side->controller() != CNTR_COMPUTER) {
side->update_controller_options();
side->set_controller(CNTR_RESERVED);
} else if (load_users == FORCE_IMPORT_USERS) {