[Commits] [wesnoth/wesnoth] fe3f31: use config object to store menu items in carryover

GitHub noreply at github.com
Wed Sep 9 14:32:03 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: fe3f317cbc71c6ce73d3ad6bb0ebe5ea3dd6ede7
      https://github.com/wesnoth/wesnoth/commit/fe3f317cbc71c6ce73d3ad6bb0ebe5ea3dd6ede7
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  use config object to store menu items in carryover

the carryover code does not modify the menu items to there is no need to
deserialize them. Using config objects here simplyfies the code becasue
carryover is now independent from the wmi_container's class.


  Commit: 402a97e1fc9404618dd2d387839781d49c094eac
      https://github.com/wesnoth/wesnoth/commit/402a97e1fc9404618dd2d387839781d49c094eac
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/game_events/wmi_container.cpp

  Log Message:
  -----------
  fix some code formatting


  Commit: adc5eca399236715e471844bfb2dea84d995243e
      https://github.com/wesnoth/wesnoth/commit/adc5eca399236715e471844bfb2dea84d995243e
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  add optional string key parameter to config::append_children


  Commit: 368a4ab284ec7cb56a9c9b9513b60cef13cd053c
      https://github.com/wesnoth/wesnoth/commit/368a4ab284ec7cb56a9c9b9513b60cef13cd053c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/reports.hpp

  Log Message:
  -----------
  fix indention


  Commit: 12e839b9b7abafabe0e9469ef79de02b099453ea
      https://github.com/wesnoth/wesnoth/commit/12e839b9b7abafabe0e9469ef79de02b099453ea
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/game_state.cpp
    M src/play_controller.cpp
    M src/replay_controller.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp

  Log Message:
  -----------
  remove level_ member of game_lua_kernel

the intention is to be able to remove the level cfg.


  Commit: 4103ae29f50cc0ebb373d75c61e15f3b07604b2c
      https://github.com/wesnoth/wesnoth/commit/4103ae29f50cc0ebb373d75c61e15f3b07604b2c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  remove unused play_controller::start_turn_ variable


  Commit: 4afe65b4da308637f17caa04dd4e5cdd236aa995
      https://github.com/wesnoth/wesnoth/commit/4afe65b4da308637f17caa04dd4e5cdd236aa995
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playsingle_controller.cpp
    M src/replay_controller.cpp
    M src/tod_manager.cpp
    M src/tod_manager.hpp

  Log Message:
  -----------
  move it_is_a_new_turn_ variable to tod_manager

it_is_a_new_turn_ is part of the gamestate so it should be part of the game_state object.


  Commit: 12b901933a1fd4f7de3ce4bc9a7aeb30cfe604a5
      https://github.com/wesnoth/wesnoth/commit/12b901933a1fd4f7de3ce4bc9a7aeb30cfe604a5
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/actions/undo.cpp
    M src/game_board.cpp
    M src/game_board.hpp
    M src/game_initialization/multiplayer.cpp
    M src/game_state.cpp
    M src/game_state.hpp
    M src/play_controller.cpp
    M src/replay_controller.cpp
    M src/synced_context.cpp
    M src/tests/test_unit_map.cpp
    M src/unit.cpp
    M src/unit_id.cpp
    M src/unit_id.hpp
    M src/unit_map.cpp

  Log Message:
  -----------
  make the unit id manager a member of game_board

previously it was a singleton

the next unit id counter is part of the gamestate so it should be part of the game_state object.


  Commit: 41e363a3fd71faf332bf9167a0926dc3954c5387
      https://github.com/wesnoth/wesnoth/commit/41e363a3fd71faf332bf9167a0926dc3954c5387
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/reports.cpp

  Log Message:
  -----------
  fix a segfault caused by wesnoth.theme_items

http://gna.org/bugs/?23856

previously reports::register_generator sometimes created two shared_ptr
from one generator * which caused that generator to be freed twice (or
worse).


  Commit: 9ac0434c1d185486153ba853aeceb1e3a802959a
      https://github.com/wesnoth/wesnoth/commit/9ac0434c1d185486153ba853aeceb1e3a802959a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/play_controller.cpp

  Log Message:
  -----------
  use play_controller::player_number_ to write [snapshot]playing_team=


  Commit: 58874bdd0bec90542255b46bf74898a90b28afd7
      https://github.com/wesnoth/wesnoth/commit/58874bdd0bec90542255b46bf74898a90b28afd7
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  remove level_ from game_state class

The intention is to remove the level config (mainly to decrease memory usage)


Compare: https://github.com/wesnoth/wesnoth/compare/00516dddbe66...58874bdd0bec


More information about the Commits mailing list