Merge lp:~widelands-dev/widelands/bugfix-buildings-tooltips into lp:widelands

[hessenfarmer]

Fixes various bugs with buildings tooltips

For lumberjacks, scouts and trainingsites tooltips are now cleared if building starts working again.
Trainingsites now show completed messages

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4823. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/525342093.
Appveyor build 4604. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bugfix_buildings_tooltips-4604.

[GunChleoc (gunchleoc)]

1 nit, not tested yet.

[hessenfarmer (stephan-lutz)]

Ok adrresed code review. However .c_str() did not compile so I stood with .str() which works fine.

Have tested this and added a translators hint.

[GunChleoc (gunchleoc)]

I overlooked that you were using boost::format, so c_str() is not necessary.

So, code LGTM now :)

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4829. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/525646461.
Appveyor build 4610. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bugfix_buildings_tooltips-4610.

[hessenfarmer (stephan-lutz)]

Thanks for the review. I would wait for an independent test review, unless you decide to already have it relying on my own testing

[Toni Förster (stonerl)]

Can confirm that it is working.

Just one addition. In case of the Mines, the message "Main coal/gold/iron vein exhausted" should have the highest priority. If the vein is exhausted and no ration/snack/meal is available. The message for exhausted veins should not be replaced by the no food message.

Shall I open another bugreport for this?

review: Approve (played)

[hessenfarmer (stephan-lutz)]

I think I have seen already an old bugreport for this (the mines) lately. So you could search the bugs and promote this old one for b21 instead.

[hessenfarmer (stephan-lutz)]

As the fix for the mines messages is more complex I'd like to have this one first.

@bunnybot merge

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4829. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/525646461.

[hessenfarmer (stephan-lutz)]

the inputqueues test again (gcc4.8 debug this time)

@bunnybot merge force

=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2019-04-24 06:01:37 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2019-04-28 14:59:09 +0000
@@ -1415,6 +1415,9 @@
 		throw wexception("Fail training soldier!!");
 	}
 	ps.molog("  Training done!\n");
+	/** TRANSLATORS: Success message of a trainingsite ‘%s’ stands for the description of the training program */
+	/**  e.g. Completed upgrading soldier evade from level 0 to level 1 */
+	ps.set_production_result((boost::format(_("Completed %s")) % ps.top_state().program->descname()).str());
 
 	upcast(TrainingSite, ts, &ps);
 	ts->training_successful(attribute, level);
 
=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc	2019-04-24 06:01:37 +0000
+++ src/logic/map_objects/tribes/worker.cc	2019-04-28 14:59:09 +0000
@@ -340,6 +340,9 @@
 			return true;
 		}
 		if (action.sparam1 == "immovable") {
+			if (upcast(ProductionSite, productionsite, get_location(game))) {
+				productionsite->unnotify_player();
+			}
 			std::vector<ImmovableFound> list;
 			if (action.iparam2 < 0)
 				map.find_reachable_immovables(area, &list, cstep);
@@ -2639,7 +2642,9 @@
  */
 bool Worker::run_scout(Game& game, State& state, const Action& action) {
 	molog("  Try scouting for %i ms with search in radius of %i\n", action.iparam2, action.iparam1);
-
+	if (upcast(ProductionSite, productionsite, get_location(game))) {
+		productionsite->unnotify_player();
+	}
 	++state.ivar1;
 	start_task_scout(game, action.iparam1, action.iparam2);
 	// state reference may be invalid now