[Commits] [wesnoth/wesnoth] 4830b8: partially remove resources::game_map (part 1)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 4830b8ee3c3e2d4a7c11c8ab943a0af53f736a53
      https://github.com/wesnoth/wesnoth/commit/4830b8ee3c3e2d4a7c11c8ab943a0af53f736a53
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M src/actions/attack.cpp
    M src/actions/create.cpp
    M src/actions/heal.cpp
    M src/actions/move.cpp
    M src/actions/undo.cpp
    M src/ai/actions.cpp
    M src/ai/akihara/recruitment.cpp
    M src/ai/contexts.cpp
    M src/ai/default/ai.cpp
    M src/ai/default/contexts.cpp
    M src/ai/formula/ai.cpp
    M src/ai/formula/callable_objects.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/testing/ca.cpp
    M src/ai/testing/ca_testing_move_to_targets.cpp
    M src/ai/testing/ca_testing_recruitment.cpp
    M src/game_events/action_wml.cpp
    M src/help.cpp
    M src/menu_events.cpp
    M src/mouse_events.cpp
    M src/pathfind/pathfind.cpp
    M src/play_controller.cpp
    M src/reports.cpp
    M src/scripting/lua.cpp
    M src/terrain_filter.cpp
    M src/unit.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/utility.cpp

  Log Message:
  -----------
  partially remove resources::game_map (part 1)

This is the result of running, in src/ directory, the following:

find . -type f -exec sed -i 's/resources::game_map->/resources::gameboard->map()./g' '{}' \;

and carefully inspecting the result, and adding "game_board.hpp"


  Commit: aab7edd88ce4842e29d807be31ebcb014b49f638
      https://github.com/wesnoth/wesnoth/commit/aab7edd88ce4842e29d807be31ebcb014b49f638
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M src/actions/create.cpp
    M src/actions/heal.cpp
    M src/actions/move.cpp
    M src/actions/vision.cpp
    M src/ai/actions.cpp
    M src/ai/default/ai.cpp
    M src/ai/default/contexts.cpp
    M src/ai/formula/ai.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/testing/aspect_attacks.cpp
    M src/ai/testing/ca.cpp
    M src/ai/testing/ca_testing_move_to_targets.cpp
    M src/game_board.cpp
    M src/game_events/action_wml.cpp
    M src/mouse_events.cpp
    M src/movetype.cpp
    M src/pathfind/pathfind.cpp
    M src/reports.cpp
    M src/scripting/lua.cpp
    M src/terrain_filter.cpp
    M src/tod_manager.cpp
    M src/unit.cpp
    M src/unit.hpp
    M src/whiteboard/mapbuilder.cpp
    M src/whiteboard/move.cpp
    M src/whiteboard/utility.cpp

  Log Message:
  -----------
  remove resources::game_map (part 2)

This the result of executing, in folder src/, the following

find . -type f -exec sed -i 's/\*resources\:\:game_map/resources\:\:gameboard->map()/g' '{}' \;

and carefully inspecting the result.

We also had to add game_board.hpp includes in various places,
and change the arguent order of unit::is_visible_to_team --
this function was taking *resources::game_map as its default
argument, and we do not want to include game_board in unit.hpp,
as it creates cyclic dependencies. This was resolved by
eliminating this as a default value -- this is an improvement,
since usually when this function was called it was in a context
where a game_map was available already locally anyways.


  Commit: 22cc827d718730d8eccb3997c6bde8beb9319aa8
      https://github.com/wesnoth/wesnoth/commit/22cc827d718730d8eccb3997c6bde8beb9319aa8
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M src/actions/create.cpp
    M src/editor/editor_controller.cpp
    M src/editor/map/context_manager.cpp
    M src/game_events/action_wml.cpp
    M src/help.cpp
    M src/map_location.cpp
    M src/play_controller.cpp
    M src/resources.cpp
    M src/resources.hpp
    M src/unit.cpp
    M src/unit_abilities.cpp

  Log Message:
  -----------
  finish removing resources::game_map

The remaining uses are just, checking whether or not the pointer
is null, or resets to its value, or simply storing it in a local
variable.

It might be appropriate to add resources::game_map back as a
function taking no parameters, at least this is flexible
enough to be changed later easily.


  Commit: 148d42ea88a097cc4f218c180fc7370e58e5e6a0
      https://github.com/wesnoth/wesnoth/commit/148d42ea88a097cc4f218c180fc7370e58e5e6a0
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/editor/map/context_manager.cpp
    M src/editor/map/map_context.cpp
    M src/editor/map/map_context.hpp
    M src/game_controller.cpp
    M src/game_controller.hpp
    M src/game_preferences.hpp
    M src/gamestatus.cpp
    M src/gamestatus.hpp
    M src/mp_game_utils.cpp
    M src/mp_game_utils.hpp
    M src/multiplayer.cpp
    M src/multiplayer.hpp
    M src/multiplayer_connect_engine.cpp
    M src/multiplayer_connect_engine.hpp
    M src/multiplayer_create.cpp
    M src/multiplayer_create.hpp
    M src/multiplayer_create_engine.cpp
    M src/multiplayer_create_engine.hpp
    M src/multiplayer_wait.cpp
    M src/multiplayer_wait.hpp
    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/playmp_controller.hpp
    M src/playsingle_controller.cpp
    M src/playsingle_controller.hpp
    M src/replay_controller.cpp
    M src/replay_controller.hpp
    A src/saved_game.cpp
    A src/saved_game.hpp
    M src/savegame.cpp
    M src/savegame.hpp
    M src/tests/test_mp_connect.cpp
    M src/tests/utils/play_scenario.cpp

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/c9be48f57080...148d42ea88a0