widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

Review: Approve

LGTM now :)

I'd like to retest this due to the code changes made during review.

Diff comments:

> 
> === modified file 'src/logic/map_objects/tribes/militarysite.cc'
> --- src/logic/map_objects/tribes/militarysite.cc	2019-05-26 17:21:15 +0000
> +++ src/logic/map_objects/tribes/militarysite.cc	2019-05-28 15:09:01 +0000
> @@ -982,6 +982,13 @@
>  	return false;
>  }
>  
> +const BuildingSettings* MilitarySite::create_building_settings() const {
> +	MilitarysiteSettings* settings = new MilitarysiteSettings(descr());
> +	settings->desired_capacity = std::min(settings->max_capacity, soldier_control_.soldier_capacity());
> +	settings->prefer_heroes = soldier_preference_ == SoldierPreference::kHeroes;

Yes I did! So, this is correct :)

> +	return settings;
> +}
> +
>  // setters
>  
>  void MilitarySite::set_soldier_preference(SoldierPreference p) {


-- 
https://code.launchpad.net/~widelands-dev/widelands/constructionsite_options/+merge/367428
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/constructionsite_options.