[Commits] [wesnoth/wesnoth] 5a9da1: Integrate create_engine into sp campaign selection

Mon Jul 14 18:08:35 UTC 2014

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5a9da1aeaf4940f1f3f20ac524414b0d9b2172eb
      https://github.com/wesnoth/wesnoth/commit/5a9da1aeaf4940f1f3f20ac524414b0d9b2172eb
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M data/_main.cfg
    M src/game_config_manager.cpp
    M src/game_launcher.cpp
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/campaign_selection.hpp
    M src/multiplayer.cpp
    M src/multiplayer.hpp
    M src/multiplayer_create.cpp
    M src/multiplayer_create_engine.cpp
    M src/multiplayer_create_engine.hpp

  Log Message:
  -----------
  Integrate create_engine into sp campaign selection

After campaign selection, the mp codepath is followed starting with
enter_configure_mode().
Code for sorting and marking completed campaigns, as well as for difficulty selection, has been moved to create_engine.
Also, [scenario] tags are now converted to [multiplayer] for sp as in mp.

Conflicts:
	src/game_controller.cpp
	src/multiplayer.cpp

  Commit: 0b3499cc66b8a6d52de0ab329db85a98aa75306f
      https://github.com/wesnoth/wesnoth/commit/0b3499cc66b8a6d52de0ab329db85a98aa75306f
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M data/_main.cfg
    A data/era_blank.cfg
    M data/multiplayer/eras.cfg

  Log Message:
  -----------
  Create a blank era for sp

Also, moved the "Custom" mp side to be loaded outside of the MULTIPLAYER define.

  Commit: ccded6f752a85731bc1cff6daf660d02d41c0a54
      https://github.com/wesnoth/wesnoth/commit/ccded6f752a85731bc1cff6daf660d02d41c0a54
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/multiplayer_create_engine.cpp

  Log Message:
  -----------
  Prevent config reload in create_engine ctor for sp

  Commit: 2bb507383ed86145af86e05e8596612fd3257955
      https://github.com/wesnoth/wesnoth/commit/2bb507383ed86145af86e05e8596612fd3257955
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/multiplayer.cpp
    M src/multiplayer_configure.cpp
    M src/multiplayer_configure.hpp
    A src/multiplayer_configure_engine.cpp
    A src/multiplayer_configure_engine.hpp
    M src/settings.cpp
    M src/settings.hpp

  Log Message:
  -----------
  Implemented multiplayer_configure_engine

  Commit: 73a722e0b63608e32f36de0146bd2da0ee38854a
      https://github.com/wesnoth/wesnoth/commit/73a722e0b63608e32f36de0146bd2da0ee38854a
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/multiplayer.cpp
    M src/multiplayer_connect_engine.cpp

  Log Message:
  -----------
  Implemented gui-less mp_connect for sp

Also, made sides with blank controllers default to ai in sp.

  Commit: 9f5c7261be60a5e897915806205c17300446f91f
      https://github.com/wesnoth/wesnoth/commit/9f5c7261be60a5e897915806205c17300446f91f
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/multiplayer.cpp

  Log Message:
  -----------
  Changed the way play_game is called for sp

Previously, in sp, play_game was called from both enter_connect_mode and goto_campaign (via launch_game). I've edited enter_connect_mode to return true instead of calling play_game, so launch_game is used instead. (This contains some code relevent to sp campaigns, but still uses the mp-codepath-modified saved_game (state_) object.)

  Commit: 33c717a505c4e9de5b4954048f76c769b302f80c
      https://github.com/wesnoth/wesnoth/commit/33c717a505c4e9de5b4954048f76c769b302f80c
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/multiplayer_create_engine.cpp

  Log Message:
  -----------
  Added hybrid campaigns to list of sp campaigns

  Commit: 381b0f1c33a201423a92b0978ba5e9b36ae75d61
      https://github.com/wesnoth/wesnoth/commit/381b0f1c33a201423a92b0978ba5e9b36ae75d61
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/flg_manager.cpp
    M src/game_launcher.cpp

  Log Message:
  -----------
  Fix for campaign scenarios with no recruits

Also, fixed a bug where the proper scenario wasn't being loaded via commandline.

  Commit: 3dd10c15c883bc7416ef4aa72e3b4aaf8ab845ad
      https://github.com/wesnoth/wesnoth/commit/3dd10c15c883bc7416ef4aa72e3b4aaf8ab845ad
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/game_launcher.cpp
    M src/multiplayer.cpp
    A src/singleplayer.cpp
    A src/singleplayer.hpp

  Log Message:
  -----------
  Move sp engine handlers to their own methods.

These methods are contained in their own header/source, singleplayer.*pp

  Commit: ebda2bc2cd4f403ae2345ca05870f6fd43e17d51
      https://github.com/wesnoth/wesnoth/commit/ebda2bc2cd4f403ae2345ca05870f6fd43e17d51
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/flg_manager.cpp

  Log Message:
  -----------
  Fix "random" leader being added to no_leader sides

  Commit: 292b22f8595be9fa99bd8243a929eec383ccbbd4
      https://github.com/wesnoth/wesnoth/commit/292b22f8595be9fa99bd8243a929eec383ccbbd4
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  Fixed gui2 test for modified tcampaign_selection

  Commit: d4c2710b3ea78d766dd2924db174a4d250252401
      https://github.com/wesnoth/wesnoth/commit/d4c2710b3ea78d766dd2924db174a4d250252401
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/flg_manager.cpp

  Log Message:
  -----------
  a leader can now be chosen for no_leader sides

To remedy the previous problem with these sides, the "random" leader will only be made available if there are other
leaders available.

  Commit: fe1c7fe30ab1bcc94c2e70685ab8df404ca4da5b
      https://github.com/wesnoth/wesnoth/commit/fe1c7fe30ab1bcc94c2e70685ab8df404ca4da5b
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/multiplayer.cpp
    M src/multiplayer.hpp

  Log Message:
  -----------
  revert changes to enter_configure_mode scope

These should probably just stay static.

  Commit: d06ec5c775feedb969b2916824e7b09bfa2c7743
      https://github.com/wesnoth/wesnoth/commit/d06ec5c775feedb969b2916824e7b09bfa2c7743
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/flg_manager.cpp

  Log Message:
  -----------
  Fix for earlier changes to flg_manager.

The order of leader options is now as it should be.

  Commit: efdea6573f8f9debb8a2b6722a3e91cc544168e7
      https://github.com/wesnoth/wesnoth/commit/efdea6573f8f9debb8a2b6722a3e91cc544168e7
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    A data/gui/default/window/depcheck_confirm_change.cfg
    A data/gui/default/window/depcheck_select_new.cfg
    R data/gui/default/window/mp_depcheck_confirm_change.cfg
    R data/gui/default/window/mp_depcheck_select_new.cfg
    M src/CMakeLists.txt
    M src/SConscript
    A src/configure_engine.cpp
    A src/configure_engine.hpp
    A src/connect_engine.cpp
    A src/connect_engine.hpp
    A src/create_engine.cpp
    A src/create_engine.hpp
    A src/depcheck.cpp
    A src/depcheck.hpp
    M src/flg_manager.cpp
    M src/flg_manager.hpp
    M src/game_launcher.cpp
    M src/gui/dialogs/campaign_selection.hpp
    A src/gui/dialogs/depcheck_confirm_change.cpp
    A src/gui/dialogs/depcheck_confirm_change.hpp
    A src/gui/dialogs/depcheck_select_new.cpp
    A src/gui/dialogs/depcheck_select_new.hpp
    R src/gui/dialogs/mp_depcheck_confirm_change.cpp
    R src/gui/dialogs/mp_depcheck_confirm_change.hpp
    R src/gui/dialogs/mp_depcheck_select_new.cpp
    R src/gui/dialogs/mp_depcheck_select_new.hpp
    R src/mp_depcheck.cpp
    R src/mp_depcheck.hpp
    M src/mp_options.hpp
    M src/multiplayer.cpp
    M src/multiplayer.hpp
    M src/multiplayer_configure.hpp
    R src/multiplayer_configure_engine.cpp
    R src/multiplayer_configure_engine.hpp
    M src/multiplayer_connect.cpp
    M src/multiplayer_connect.hpp
    R src/multiplayer_connect_engine.cpp
    R src/multiplayer_connect_engine.hpp
    M src/multiplayer_create.cpp
    M src/multiplayer_create.hpp
    R src/multiplayer_create_engine.cpp
    R src/multiplayer_create_engine.hpp
    M src/multiplayer_wait.cpp
    M src/multiplayer_wait.hpp
    M src/playcampaign.cpp
    M src/singleplayer.cpp
    M src/singleplayer.hpp
    M src/tests/gui/test_gui2.cpp
    M src/tests/test_mp_connect.cpp

  Log Message:
  -----------
  Adjust namespaces for mp and sp

moved engine code into "ng" namespace. Moved sp code into "sp" namespace.
Also, renamed some files to reflect the change.

  Commit: c77be2489f6f26c0ecd5c228b3235ba1174f9b48
      https://github.com/wesnoth/wesnoth/commit/c77be2489f6f26c0ecd5c228b3235ba1174f9b48
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/wesnoth.cpp

  Log Message:
  -----------
  remove additional reload for sp campaigns.

  Commit: ba71022027aef27844d31e92411705d4b363f007
      https://github.com/wesnoth/wesnoth/commit/ba71022027aef27844d31e92411705d4b363f007
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-07-13 (Sun, 13 Jul 2014)

  Changed paths:
    M src/mp_game_utils.cpp
    M src/saved_game.cpp

  Log Message:
  -----------
  fix campaign_type for sp

Previously, mp_game_utils.cpp::level_to_gamestate was setting campaign_type to multiplayer; this has been fixed.
Also, fixed some game loading code to adjust to the change.

  Commit: 35b9d5baa31b2775d78ce6535970562a95f1f122
      https://github.com/wesnoth/wesnoth/commit/35b9d5baa31b2775d78ce6535970562a95f1f122
  Author: Andrius Silinskas <silinskas.andrius at gmail.com>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M data/_main.cfg
    A data/era_blank.cfg
    A data/gui/default/window/depcheck_confirm_change.cfg
    A data/gui/default/window/depcheck_select_new.cfg
    R data/gui/default/window/mp_depcheck_confirm_change.cfg
    R data/gui/default/window/mp_depcheck_select_new.cfg
    M data/multiplayer/eras.cfg
    M src/CMakeLists.txt
    M src/SConscript
    A src/configure_engine.cpp
    A src/configure_engine.hpp
    A src/connect_engine.cpp
    A src/connect_engine.hpp
    A src/create_engine.cpp
    A src/create_engine.hpp
    A src/depcheck.cpp
    A src/depcheck.hpp
    M src/flg_manager.cpp
    M src/flg_manager.hpp
    M src/game_config_manager.cpp
    M src/game_launcher.cpp
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/campaign_selection.hpp
    A src/gui/dialogs/depcheck_confirm_change.cpp
    A src/gui/dialogs/depcheck_confirm_change.hpp
    A src/gui/dialogs/depcheck_select_new.cpp
    A src/gui/dialogs/depcheck_select_new.hpp
    R src/gui/dialogs/mp_depcheck_confirm_change.cpp
    R src/gui/dialogs/mp_depcheck_confirm_change.hpp
    R src/gui/dialogs/mp_depcheck_select_new.cpp
    R src/gui/dialogs/mp_depcheck_select_new.hpp
    R src/mp_depcheck.cpp
    R src/mp_depcheck.hpp
    M src/mp_game_utils.cpp
    M src/mp_options.hpp
    M src/multiplayer.cpp
    M src/multiplayer.hpp
    M src/multiplayer_configure.cpp
    M src/multiplayer_configure.hpp
    M src/multiplayer_connect.cpp
    M src/multiplayer_connect.hpp
    R src/multiplayer_connect_engine.cpp
    R src/multiplayer_connect_engine.hpp
    M src/multiplayer_create.cpp
    M src/multiplayer_create.hpp
    R src/multiplayer_create_engine.cpp
    R src/multiplayer_create_engine.hpp
    M src/multiplayer_wait.cpp
    M src/multiplayer_wait.hpp
    M src/playcampaign.cpp
    M src/saved_game.cpp
    M src/settings.cpp
    M src/settings.hpp
    A src/singleplayer.cpp
    A src/singleplayer.hpp
    M src/tests/gui/test_gui2.cpp
    M src/tests/test_mp_connect.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Merge pull request #242 from Rift-Walker/merge_sp_mp

Merge single- and multi-player codepaths

Compare: https://github.com/wesnoth/wesnoth/compare/3ddea55e0085...35b9d5baa31b