Merge lp:~widelands-dev/widelands/immovable-grow-owner into lp:widelands

[Benedikt Straub]

Keep an immovable's owner when growing, so tribe immovables don't lose their owner

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4015. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/431847963.
Appveyor build 3812. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovable_grow_owner-3812.

[Benedikt Straub (nordfriese)]

Travis fails because of codecheck errors that are already in trunk

[GunChleoc (gunchleoc)]

LGTM, thanks for the fix :)

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4022. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432363063.
Appveyor build 3818. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovable_grow_owner-3818.

=== modified file 'src/logic/map_objects/immovable.cc'
--- src/logic/map_objects/immovable.cc	2018-09-04 15:48:47 +0000
+++ src/logic/map_objects/immovable.cc	2018-09-24 07:55:20 +0000
@@ -928,9 +928,10 @@
 	if (logic_rand_as_double(&game) <
 	    probability_to_grow(descr.terrain_affinity(), f, map, game.world().terrains())) {
 		MapObjectDescr::OwnerType owner_type = descr.owner_type();
+		Player* owner = immovable.get_owner();
 		immovable.remove(game);  //  Now immovable is a dangling reference!
 		game.create_immovable_with_name(
-		   f, type_name, owner_type, nullptr /* owner */, nullptr /* former_building_descr */);
+		   f, type_name, owner_type, owner, nullptr /* former_building_descr */);
 	} else {
 		immovable.program_step(game);
 	}