← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~widelands-dev/widelands/bug-863185-census-on-destroyed-building into lp:widelands

 

Review: Approve

lgtm. minor nits inlined.

Diff comments:

> 
> === modified file 'src/logic/map_objects/immovable.cc'
> --- src/logic/map_objects/immovable.cc	2016-11-03 07:37:58 +0000
> +++ src/logic/map_objects/immovable.cc	2016-11-17 08:29:59 +0000
> @@ -340,8 +344,9 @@
>  ==============================
>  */
>  
> -Immovable::Immovable(const ImmovableDescr& imm_descr)
> +Immovable::Immovable(const ImmovableDescr& imm_descr, const Widelands::Building* former_building)
>     : BaseImmovable(imm_descr),
> +     former_building_(former_building ? &former_building->descr() : nullptr),

rename: former_building_descr_

>       anim_(0),
>       animstart_(0),
>       program_(nullptr),
> @@ -349,6 +354,9 @@
>       anim_construction_total_(0),
>       anim_construction_done_(0),
>       program_step_(0) {
> +	if (former_building) {

nit: != nullptr. Implicit casts to bool make me nervous and I find it enforces the type of the variable. your call.

> +		set_owner(former_building->get_owner());
> +	}
>  }
>  
>  Immovable::~Immovable() {


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-863185-census-on-destroyed-building/+merge/309818
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-863185-census-on-destroyed-building.


References