widelands-dev team mailing list archive

[TiborB <tiborb95@xxxxxxxxx>]

TiborB has proposed merging lp:~widelands-dev/widelands/bug-1442869 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1442869 in widelands: "Stopped production sites should produce something from their consumed wares befor they stop"
  https://bugs.launchpad.net/widelands/+bug/1442869

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1442869/+merge/258203

This fix provides that building stop is considered only before (when going to begin) first step of a production cycle.

Side note: Maybe similar issue is with training centers?
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1442869 into lp:widelands.

=== modified file 'src/logic/productionsite.cc'
--- src/logic/productionsite.cc	2015-02-19 21:12:46 +0000
+++ src/logic/productionsite.cc	2015-05-04 19:22:07 +0000
@@ -650,7 +650,10 @@
 {
 	State & state = top_state();
 
-	if (m_is_stopped) {
+	// 'Stop' of building is considered only when starting
+	// new productions cycle. Otherwise it can lead to consumption
+	// of input wares without producing anything
+	if (m_is_stopped && state.ip == 0) {
 		program_end(game, Failed);
 		m_program_timer = true;
 		m_program_time = schedule_act(game, 20000);