← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/bug-1786613-500ms-return-skipped into lp:widelands

 

Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1786613-500ms-return-skipped into lp:widelands.

Commit message:
reduce waiting time to 500ms for skipped programs

Requested reviews:
  hessenfarmer (stephan-lutz)
Related bugs:
  Bug #1786613 in widelands: "production times are 10s longer when return=skipped"
  https://bugs.launchpad.net/widelands/+bug/1786613

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1786613-500ms-return-skipped/+merge/353028

That "penalty" is reduced to 500ms. Which, according to @hessenfarmer's testing may be the sweetspot
-- 
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1786613-500ms-return-skipped.
=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2018-06-19 08:52:49 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2018-08-13 20:06:37 +0000
@@ -899,7 +899,7 @@
 	SkippedPrograms::const_iterator i = skipped_programs_.find(program_name);
 	if (i != skipped_programs_.end()) {
 		uint32_t const gametime = game.get_gametime();
-		uint32_t const earliest_allowed_start_time = i->second + 10000;
+		uint32_t const earliest_allowed_start_time = i->second + 500;
 		if (gametime + tdelta < earliest_allowed_start_time)
 			tdelta = earliest_allowed_start_time - gametime;
 	}


Follow ups