Merge lp:~widelands-dev/widelands/bug-1806903-worker-default-quantities into lp:widelands

[Notabilis]

Fixing copy&paste bug with worker quantity defaults.

Resetting the economy targets of workers (i.e., recruits and secondary carriers) resulted in strange amounts. The problem was a copy&paste bug when creating the relevant reset code. The code assigned the default economy amounts of the respective wares with the same description index, resulting in either small strange amounts (taken from some "random" ware) or the value 254 if no ware with the respective description index exists.
Fixed by calling the correct functions for workers instead of the ones for wares.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4349. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/470216451.
Appveyor build 4143. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1806903_worker_default_quantities-4143.

[GunChleoc (gunchleoc)]

Good catch :)

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4349. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/470216451.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4364. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/472186151.
Appveyor build 4157. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1806903_worker_default_quantities-4157.

[Toni Förster (stonerl)]

@bunnybot merge

=== modified file 'src/logic/playercommand.cc'
--- src/logic/playercommand.cc	2018-12-13 07:24:01 +0000
+++ src/logic/playercommand.cc	2018-12-25 21:16:35 +0000
@@ -1375,8 +1375,8 @@
 void CmdResetWorkerTargetQuantity::execute(Game& game) {
 	Player* player = game.get_player(sender());
 	const TribeDescr& tribe = player->tribe();
-	if (player->has_economy(economy()) && game.tribes().ware_exists(ware_type())) {
-		const int count = tribe.get_ware_descr(ware_type())->default_target_quantity(tribe.name());
+	if (player->has_economy(economy()) && game.tribes().worker_exists(ware_type())) {
+		const int count = tribe.get_worker_descr(ware_type())->default_target_quantity();
 		player->get_economy(economy())->set_worker_target_quantity(ware_type(), count, duetime());
 	}
 }