[Commits] [wesnoth/wesnoth] 968738: move carryover into its own file

GitHub noreply at github.com
Sun Jun 1 22:56:33 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9687383d0f94c54c2d743e5921b0c6a0747e608a
      https://github.com/wesnoth/wesnoth/commit/9687383d0f94c54c2d743e5921b0c6a0747e608a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-06-01 (Sun, 01 Jun 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    A src/carryover.cpp
    A src/carryover.hpp
    M src/gamestatus.cpp
    M src/gamestatus.hpp
    M src/mp_game_utils.cpp
    M src/playcampaign.cpp
    M src/playcampaign.hpp
    M src/replay_controller.cpp
    M src/savegame.cpp

  Log Message:
  -----------
  move carryover into its own file


  Commit: a08efab4c0425e8f770e1f5a5db30445fdce63a7
      https://github.com/wesnoth/wesnoth/commit/a08efab4c0425e8f770e1f5a5db30445fdce63a7
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-06-01 (Sun, 01 Jun 2014)

  Changed paths:
    M src/gamestatus.cpp
    M src/gamestatus.hpp
    M src/play_controller.cpp

  Log Message:
  -----------
  remove unused variable


  Commit: 83acdf28705268c395eef44ef1441780cd8b2b88
      https://github.com/wesnoth/wesnoth/commit/83acdf28705268c395eef44ef1441780cd8b2b88
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-06-01 (Sun, 01 Jun 2014)

  Changed paths:
    M src/gamestatus.cpp

  Log Message:
  -----------
  remove unused variable continuance


  Commit: afbf5c6e5804ef5a31a40b4bcb59a41f389e5a40
      https://github.com/wesnoth/wesnoth/commit/afbf5c6e5804ef5a31a40b4bcb59a41f389e5a40
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-06-01 (Sun, 01 Jun 2014)

  Changed paths:
    M src/ai/default/ai.cpp
    M src/ai/testing/ca.cpp
    M src/editor/editor_controller.cpp
    M src/editor/map/context_manager.cpp
    M src/game_events/action_wml.cpp
    M src/gamestatus.cpp
    M src/gamestatus.hpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playmp_controller.cpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/replay_controller.cpp
    M src/resources.cpp
    M src/resources.hpp
    M src/savegame.cpp
    M src/savegame.hpp
    M src/scripting/lua.cpp
    M src/synced_checkup.hpp
    M src/synced_context.cpp

  Log Message:
  -----------
  remove resources::state_of_game

we don't want to expose the fileds "snapshot", "carryover_sides".
instead we only add classification, and mp_game_setting to resources
which are members of game_state.

in order to do that, we have to add a do_autosave method to
play_controller.

this commit also moves some code from game_state::write_snapshot to
play_controller::to_config which was intended to be in a different
commit.


  Commit: 1a03e61165f63df911c2f591c268d9087e99c989
      https://github.com/wesnoth/wesnoth/commit/1a03e61165f63df911c2f591c268d9087e99c989
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-06-01 (Sun, 01 Jun 2014)

  Changed paths:
    M src/carryover.cpp
    M src/playcampaign.cpp

  Log Message:
  -----------
  move next_scenario_append/setting to carryover


  Commit: 6a8827a071845594cc8e0ed2da298c3060e531fb
      https://github.com/wesnoth/wesnoth/commit/6a8827a071845594cc8e0ed2da298c3060e531fb
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/ai/default/ai.cpp
    M src/ai/testing/ca.cpp
    A src/carryover.cpp
    A src/carryover.hpp
    M src/editor/editor_controller.cpp
    M src/editor/map/context_manager.cpp
    M src/game_events/action_wml.cpp
    M src/gamestatus.cpp
    M src/gamestatus.hpp
    M src/mp_game_utils.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playcampaign.cpp
    M src/playcampaign.hpp
    M src/playmp_controller.cpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/replay_controller.cpp
    M src/resources.cpp
    M src/resources.hpp
    M src/savegame.cpp
    M src/savegame.hpp
    M src/scripting/lua.cpp
    M src/synced_checkup.hpp
    M src/synced_context.cpp

  Log Message:
  -----------
  Merge pull request #181 from gfgtdf/gamestate_refactor

game_state refactor


Compare: https://github.com/wesnoth/wesnoth/compare/124781c9d84e...6a8827a07184


More information about the Commits mailing list