Check loaded mapgen for being used at all.#37425

Merged

ZhilkinSerg merged 27 commits intoCleverRaven:devfrom BevapDin:lib

Mar 9, 2020

+267-250

Commits on Feb 2, 2020

Remove manual JSON object member check:
BevapDin
committed
Move some repeated code into a function get_mapgen_function.
BevapDin
committed
Move some code as function into mapgen.cpp
BevapDin
committed
Remove redundant declaration.
BevapDin
committed
Remove commented out code.
BevapDin
committed
Move access to oter_mapgen into mapgen.cpp
BevapDin
committed
Remove exposing variables from mapgen.cpp in the header.
BevapDin
committed
Add separate function to register mapgen object: register_mapgen_function
BevapDin
committed
Change oter_mapgen to contain ínstances of a dedicated class
BevapDin
committed
Merge oter_mapgen_weights into oter_mapgen:
BevapDin
committed
Store pointers directly in oter_mapgen weights map instead of indices into the vector itself.
BevapDin
committed
Use weighted_int_list for oter_mapgen weights
BevapDin
committed
Move code into a member function mapgen_basic_container::pick
BevapDin
committed
Move code into a member function: mapgen_basic_container::setup
BevapDin
committed
Move code into a member function: mapgen_basic_container::check_consistency
BevapDin
committed
Make all data members of mapgen_basic_container private.
BevapDin
committed
Make a separate class for oter_mapgen
BevapDin
committed
Replace auto with actual type
BevapDin
committed
Consistent naming: "omw" just like in the other function
BevapDin
committed
Consistent naming: just "iter" as there is no need to hint the data type (and what does the "f" even stand for?)
BevapDin
committed
Add usage checks for loaded mapgen instances.
BevapDin
committed
Add some documentation.
BevapDin
committed
Encapsulate the mapgen_function function pointers within mapgen_factory
BevapDin
committed
Remove mapgen entries for overmap terrain "null".
BevapDin
committed
Follow recommendation of clang-tidy
BevapDin
committed
Make parameter offset of load_mapgen_function mandatory.
BevapDin
committed
Remove default_idx parameter from load_mapgen_function.
BevapDin
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Check loaded mapgen for being used at all.#37425

Commits on Feb 2, 2020

Remove manual JSON object member check:

Move some repeated code into a function get_mapgen_function.

Move some code as function into mapgen.cpp

Remove redundant declaration.

Remove commented out code.

Move access to oter_mapgen into mapgen.cpp

Remove exposing variables from mapgen.cpp in the header.

Add separate function to register mapgen object: register_mapgen_function

Change oter_mapgen to contain ínstances of a dedicated class

Merge oter_mapgen_weights into oter_mapgen:

Store pointers directly in oter_mapgen weights map instead of indices into the vector itself.

Use weighted_int_list for oter_mapgen weights

Move code into a member function mapgen_basic_container::pick

Move code into a member function: mapgen_basic_container::setup

Move code into a member function: mapgen_basic_container::check_consistency

Make all data members of mapgen_basic_container private.

Make a separate class for oter_mapgen

Replace `auto` with actual type

Consistent naming: "omw" just like in the other function

Consistent naming: just "iter" as there is no need to hint the data type (and what does the "f" even stand for?)

Add usage checks for loaded mapgen instances.

Add some documentation.

Encapsulate the `mapgen_function` function pointers within `mapgen_factory`

Remove mapgen entries for overmap terrain "null".

Follow recommendation of clang-tidy

Make parameter offset of load_mapgen_function mandatory.

Remove default_idx parameter from load_mapgen_function.