[Commits] [wesnoth/wesnoth] b5fbda: Implement define= for mp scenarios and eras

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b5fbda3530fb8384e502d0c24e6a868697fca186
      https://github.com/wesnoth/wesnoth/commit/b5fbda3530fb8384e502d0c24e6a868697fca186
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M changelog
    M data/core/about.cfg
    M src/game_classification.cpp
    M src/game_classification.hpp
    M src/game_config_manager.cpp
    M src/multiplayer_create.cpp
    M src/multiplayer_create_engine.cpp
    M src/multiplayer_create_engine.hpp
    M src/multiplayer_wait.cpp

  Log Message:
  -----------
  Implement define= for mp scenarios and eras

Implemented reloading of configs with define= attributes in both mp_create and mp_wait::join_game().
Added myself to about.cfg and updated changelog.

Conflicts:
	changelog
	src/gamestatus.cpp
	src/gamestatus.hpp
	src/multiplayer_wait.cpp


  Commit: 99b3bd26997d413b0ae3b4e06669b5f2b95964df
      https://github.com/wesnoth/wesnoth/commit/99b3bd26997d413b0ae3b4e06669b5f2b95964df
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M changelog
    M src/game_classification.cpp
    M src/game_classification.hpp
    M src/game_config_manager.cpp
    M src/multiplayer_create.cpp
    M src/multiplayer_create_engine.cpp
    M src/multiplayer_create_engine.hpp
    M src/multiplayer_wait.cpp

  Log Message:
  -----------
  Add define functionality to modifications.

Added a new method, void create_engine::prepare_for_era_and_mods(),
which sets era and mod in game classification.
Prepare_for_[scenario, campaign] then set their respective defines and reload.

Conflicts:
	changelog
	src/gamestatus.cpp
	src/gamestatus.hpp


  Commit: b53461e075f3b5d75c7aa25ab073a43502d36ae6
      https://github.com/wesnoth/wesnoth/commit/b53461e075f3b5d75c7aa25ab073a43502d36ae6
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M src/multiplayer.cpp

  Log Message:
  -----------
  Fixed reloading for commandline mp


  Commit: be366af5237d65a71035a535dd133d2e2313585d
      https://github.com/wesnoth/wesnoth/commit/be366af5237d65a71035a535dd133d2e2313585d
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    M data/multiplayer/scenarios/2p_Hornshark_Island.cfg
    M data/multiplayer/scenarios/4p_A_New_Land.cfg
    M data/multiplayer/scenarios/6p_Team_Survival.cfg

  Log Message:
  -----------
  Implemented defines for largest mainline scenarios


  Commit: 6270674847ea78ef9a1362d332ed4898e6c5864e
      https://github.com/wesnoth/wesnoth/commit/6270674847ea78ef9a1362d332ed4898e6c5864e
  Author: Nathan Walker <nathan.b.walker at vanderbilt.edu>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M src/multiplayer.cpp

  Log Message:
  -----------
  Fixed scoping in multiplayer commandline load

As AI0867 pointed out, config object references were available after they had been made invalid by reloading


  Commit: 5ca7121822d08ba023eb67ce3367e068a3a8083d
      https://github.com/wesnoth/wesnoth/commit/5ca7121822d08ba023eb67ce3367e068a3a8083d
  Author: Alexander van Gessel <AI0867 at gmail.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M changelog
    M data/core/about.cfg
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    M data/multiplayer/scenarios/2p_Hornshark_Island.cfg
    M data/multiplayer/scenarios/4p_A_New_Land.cfg
    M data/multiplayer/scenarios/6p_Team_Survival.cfg
    M src/game_classification.cpp
    M src/game_classification.hpp
    M src/game_config_manager.cpp
    M src/multiplayer.cpp
    M src/multiplayer_create.cpp
    M src/multiplayer_create_engine.cpp
    M src/multiplayer_create_engine.hpp
    M src/multiplayer_wait.cpp

  Log Message:
  -----------
  Merge pull request #216 from Rift-Walker/scenario_era_mod_defines_mergable

Add define functionality to scenarios, eras, and mods


Compare: https://github.com/wesnoth/wesnoth/compare/198b89b61f6e...5ca7121822d0