Merge lp:~qcumber-some/widelands/lumberjack-vision into lp:widelands

[Jens Beyer]

worker command findobject targetting an immovable is now honoring the known map, so lumberjacks and stonemasons don't magically know about existing resources the player has not discovered yet.

[SirVer (sirver)]

looks good to my puny eyes.

review: Approve

[Nicolai Hähnle (nha)]

I haven't tested it, but it certainly looks the right way to implement that feature.

It'll be another place where cheating will lead to desyncs.

review: Approve

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2010-11-01 13:12:23 +0000
+++ src/logic/worker.cc	2010-11-01 15:58:49 +0000
@@ -404,6 +404,15 @@
 						found_reserved = true;
 						list.erase(list.begin() + idx);
 					}
+					else
+					{
+						Coords const coord = imm->get_position();
+						Map_Index mapidx = map.get_index(coord, map.get_width());
+						Vision const visible = owner().vision(mapidx);
+						if (!visible) {
+							list.erase(list.begin() + idx);
+						}
+					}
 				}
 			}