widelands-dev team mailing list archive

[Martin Schmidt <launchpad@xxxxxxxxxxxxxxx>]

Martin Schmidt has proposed merging lp:~martinschmidt/widelands/bug1420521 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1420521 in widelands: "Reset target quantitiy is overwritten easily"
  https://bugs.launchpad.net/widelands/+bug/1420521

For more details, see:
https://code.launchpad.net/~martinschmidt/widelands/bug1420521/+merge/249263

Instead of zero, the current time should be used as modification time of a target quantity reset.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~martinschmidt/widelands/bug1420521 into lp:widelands.

=== modified file 'src/logic/playercommand.cc'
--- src/logic/playercommand.cc	2014-09-30 07:55:22 +0000
+++ src/logic/playercommand.cc	2015-02-10 22:35:50 +0000
@@ -1320,7 +1320,7 @@
 		const int32_t count =
 			tribe.get_ware_descr(ware_type())->default_target_quantity();
 		player.get_economy_by_number(economy())->set_ware_target_quantity
-			(ware_type(),  count, 0);
+			(ware_type(),  count, duetime() );
 	}
 }
 
@@ -1442,7 +1442,7 @@
 		const int32_t count =
 			tribe.get_ware_descr(ware_type())->default_target_quantity();
 		player.get_economy_by_number(economy())->set_worker_target_quantity
-			(ware_type(),  count, 0);
+			(ware_type(),  count, duetime());
 	}
 }