[Commits] [wesnoth/wesnoth] 9f3d15: change generator/ filenames to match classenames

GitHub noreply at github.com
Tue Aug 26 21:36:59 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9f3d1586daf1c9a0d91087ba8bbe8c805236c77c
      https://github.com/wesnoth/wesnoth/commit/9f3d1586daf1c9a0d91087ba8bbe8c805236c77c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/create_engine.cpp
    M src/create_engine.hpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/context_manager.hpp
    A src/generators/cave_map_generator.cpp
    A src/generators/cave_map_generator.hpp
    R src/generators/cavegen.cpp
    R src/generators/cavegen.hpp
    A src/generators/default_map_generator.cpp
    A src/generators/default_map_generator.hpp
    M src/generators/map_create.cpp
    A src/generators/map_generator.cpp
    A src/generators/map_generator.hpp
    R src/generators/mapgen.cpp
    R src/generators/mapgen.hpp
    R src/generators/mapgen_dialog.cpp
    R src/generators/mapgen_dialog.hpp
    M src/generators/yamg/ya_mapgen.hpp
    M src/gui/dialogs/editor_generate_map.cpp
    M src/multiplayer.cpp
    M src/multiplayer_configure.hpp
    M src/multiplayer_create.hpp

  Log Message:
  -----------
  change generator/ filenames to match classenames

also clear some header dependedcies.
we use boost::scoped_ptr instead if util::scoped_ptr in create_engine
because msvc gives warning when util::scoped_ptr is used with incomplete
types due to its virtual destructor.


  Commit: 2d872fbbc3a57dcfc2ea5aaac52df4c11d14fe12
      https://github.com/wesnoth/wesnoth/commit/2d872fbbc3a57dcfc2ea5aaac52df4c11d14fe12
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M src/generators/cave_map_generator.cpp
    M src/generators/cave_map_generator.hpp

  Log Message:
  -----------
  refactor cave map generator

we now use a helper class to store the temporary variables for
create_scenario so that we dont have to carry them areoudn if we aren't
exacuting  create_scenario


  Commit: 6b4a7456d881f4433ce7a6ada18331966986ddc7
      https://github.com/wesnoth/wesnoth/commit/6b4a7456d881f4433ce7a6ada18331966986ddc7
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M src/generators/cave_map_generator.cpp
    M src/generators/cave_map_generator.hpp

  Log Message:
  -----------
  don't calculate flipx in cavegen constructor

just like the other parts of the generation this should take place in
create_scenario


  Commit: 69d91aaf0f9d7dc59c6e9d657c7cd61ba4f553d1
      https://github.com/wesnoth/wesnoth/commit/69d91aaf0f9d7dc59c6e9d657c7cd61ba4f553d1
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M src/generators/cave_map_generator.hpp
    M src/generators/map_generator.cpp
    M src/generators/map_generator.hpp
    M src/generators/yamg/ya_mapgen.cpp
    M src/generators/yamg/ya_mapgen.hpp

  Log Message:
  -----------
  add default implementtion for map_generator::user_config


  Commit: a9836ec898fa7d404a71023f3724dd4b0ce97d89
      https://github.com/wesnoth/wesnoth/commit/a9836ec898fa7d404a71023f3724dd4b0ce97d89
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M src/generators/cave_map_generator.cpp
    M src/generators/cave_map_generator.hpp

  Log Message:
  -----------
  allow to pass a randomseed to cave_map_generator_job

it's not used yet, the plan is to allow passing a randomseed to all
map_generator::generate_map/scenario


  Commit: d5b84a26625b12147429457c5ae20379a823aa2c
      https://github.com/wesnoth/wesnoth/commit/d5b84a26625b12147429457c5ae20379a823aa2c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M src/generators/cave_map_generator.hpp

  Log Message:
  -----------
  fix \  -> / in filepath


  Commit: 494f2701ae6da7dab3d39c1c88d2020426d02295
      https://github.com/wesnoth/wesnoth/commit/494f2701ae6da7dab3d39c1c88d2020426d02295
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/create_engine.cpp
    M src/create_engine.hpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/context_manager.hpp
    A src/generators/cave_map_generator.cpp
    A src/generators/cave_map_generator.hpp
    R src/generators/cavegen.cpp
    R src/generators/cavegen.hpp
    A src/generators/default_map_generator.cpp
    A src/generators/default_map_generator.hpp
    M src/generators/map_create.cpp
    A src/generators/map_generator.cpp
    A src/generators/map_generator.hpp
    R src/generators/mapgen.cpp
    R src/generators/mapgen.hpp
    R src/generators/mapgen_dialog.cpp
    R src/generators/mapgen_dialog.hpp
    M src/generators/yamg/ya_mapgen.cpp
    M src/generators/yamg/ya_mapgen.hpp
    M src/gui/dialogs/editor_generate_map.cpp
    M src/multiplayer.cpp
    M src/multiplayer_configure.hpp
    M src/multiplayer_create.hpp

  Log Message:
  -----------
  Merge pull request #279 from gfgtdf/map_generator_refactor

Map generator refactor

the intentions/plans are:
1) fix the 'single use' cave map generator to work in mp.
we fix this by splitting the cave_map_generator into 
cave_map_generator and cave_map_generator_job from which the later is a temporary object used during generate_scenario/map

2) allow to pass a (platform independent) seed to all map generators, this is not completely implemented yet. I implemented this for the cave_map_generator_job and it was already implemented for the yamg. Is still needs to be implemented for the default_map_generator


Compare: https://github.com/wesnoth/wesnoth/compare/d5e74273133f...494f2701ae6d


More information about the Commits mailing list