Merge lp:~widelands-dev/widelands/bug-1228811-observer-minimap into lp:widelands

[GunChleoc]

Write minimap file for observers.

[Klaus Halfmann (klaus-halfmann)]

Had two computer players play while I watched and saved two times.
When trying to load the game I saw a minimap (terrain only).

review: Approve (compile, codereview, manual test)

[GunChleoc (gunchleoc)]

This raises the question: Do we want to try having more overlays here?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1051. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/125271078.
Appveyor build 882. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1228811_observer_minimap-882.

[GunChleoc (gunchleoc)]

Yep, more flags is better. The change is trivial, so I'm gonna merge

@bunnybot merge

=== modified file 'src/game_io/game_preload_packet.cc'
--- src/game_io/game_preload_packet.cc	2016-03-20 15:51:39 +0000
+++ src/game_io/game_preload_packet.cc	2016-04-25 07:33:20 +0000
@@ -124,16 +124,17 @@
 	if (!game.is_loaded()) {
 		return;
 	}
-	if (ipl != nullptr) {
+
+	std::unique_ptr< ::StreamWrite> sw(fs.open_stream_write(kMinimapFilename));
+	if (sw.get() != nullptr) {
 		const MiniMapLayer flags = MiniMapLayer::Owner | MiniMapLayer::Building | MiniMapLayer::Terrain;
-		const Point& vp = ipl->get_viewpoint();
-		std::unique_ptr< ::StreamWrite> sw(fs.open_stream_write(kMinimapFilename));
-		if (sw.get() != nullptr) {
-			write_minimap_image(game, &ipl->player(), vp, flags, sw.get());
-			sw->flush();
+		if (ipl != nullptr) {  // Player
+			write_minimap_image(game, &ipl->player(), ipl->get_viewpoint(), flags, sw.get());
+		} else { // Observer
+			write_minimap_image(game, nullptr, Point(0, 0), flags, sw.get());
 		}
+		sw->flush();
 	}
-
 }
 
 }