Merge lp:~widelands-dev/widelands/constructionsite_options into lp:widelands

[Benedikt Straub]

Set emptied input queues to max fill when enhancing a building

[Klaus Halfmann (klaus-halfmann)]

+1 one for this. While playtesting on trunk I always was hit by this.

Code looks straigforward, no time for a complete review by now.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5313. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/570516864.
Appveyor build 5086. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_constructionsite_options-5086.

[GunChleoc (gunchleoc)]

Code LGTM :)

@bunnybot merge

=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2019-06-23 12:45:29 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2019-08-11 16:00:35 +0000
@@ -1049,6 +1049,11 @@
 		for (const auto& queue : input_queues_) {
 			if (queue->get_type() == wwWARE && queue->get_index() == pair.first) {
 				pair.second.desired_fill = std::min(pair.second.max_fill, queue->get_max_fill());
+				if (pair.second.desired_fill == 0) {
+					// Players may set slots to 0 before enhancing a building to retrieve precious wares –
+					// we assume they want the slot to be fully filled in the upgraded building
+					pair.second.desired_fill = pair.second.max_fill;
+				}
 				break;
 			}
 		}
@@ -1058,6 +1063,9 @@
 		for (const auto& queue : input_queues_) {
 			if (queue->get_type() == wwWORKER && queue->get_index() == pair.first) {
 				pair.second.desired_fill = std::min(pair.second.max_fill, queue->get_max_fill());
+				if (pair.second.desired_fill == 0) {
+					pair.second.desired_fill = pair.second.max_fill;
+				}
 				break;
 			}
 		}