[Commits] [wesnoth/wesnoth] b8f26c: disable most mp_configure settings when force_lock...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b8f26c4542db8bc9bc7cb21ef4b51d775cff4c4d
      https://github.com/wesnoth/wesnoth/commit/b8f26c4542db8bc9bc7cb21ef4b51d775cff4c4d
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M src/game_initialization/configure_engine.cpp
    M src/game_initialization/configure_engine.hpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/mp_game_utils.cpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_configure.hpp

  Log Message:
  -----------
  disable most mp_configure settings when force_lock_settings=yes

When using force_lock_settings=yes that game now not only forces
use_map_settings to on, instead if doest show these options and doesn't
thouch those attributes in the scenario.
This implements http://gna.org/bugs/?23037
and might also fix some bugs related to spmp patch ( specially
https://gna.org/bugs/?23509) since force_lock_settings default to yes
for campaigns.


  Commit: 4ab3c8cf0f53272b2a193c4a2909eb299dcb3992
      https://github.com/wesnoth/wesnoth/commit/4ab3c8cf0f53272b2a193c4a2909eb299dcb3992
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M src/game_initialization/configure_engine.cpp
    M src/game_initialization/configure_engine.hpp
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/mp_game_utils.cpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_configure.hpp

  Log Message:
  -----------
  Merge pull request #411 from gfgtdf/no_configure

disable most mp_configure settings when force_lock_settings=yes


Compare: https://github.com/wesnoth/wesnoth/compare/b32580a3dec3...4ab3c8cf0f53