widelands-dev team mailing list archive

[Notabilis <notabilis27@xxxxxx>]

Notabilis has proposed merging lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1658456 in widelands: "Imperials: Soldier target quantity not changable"
  https://bugs.launchpad.net/widelands/+bug/1658456

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1658456-quantity-empire-soldier/+merge/317026

Fixed bug that the empire soldier target quantity could not be changed. Turned out to be a simple copy&paste bug: The worker id was compared against the known ware ids. The carrier animals and the other soldiers just got lucky and were accepted since there exists wares with the same id.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1658456-quantity-empire-soldier into lp:widelands.

=== modified file 'src/logic/playercommand.cc'
--- src/logic/playercommand.cc	2017-01-25 18:55:59 +0000
+++ src/logic/playercommand.cc	2017-02-11 09:53:49 +0000
@@ -1309,7 +1309,7 @@
 
 void CmdSetWorkerTargetQuantity::execute(Game& game) {
 	Player& player = game.player(sender());
-	if (economy() < player.get_nr_economies() && game.tribes().ware_exists(ware_type())) {
+	if (economy() < player.get_nr_economies() && game.tribes().worker_exists(ware_type())) {
 		player.get_economy_by_number(economy())->set_worker_target_quantity(
 		   ware_type(), permanent_, duetime());
 	}