widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport into lp:widelands.

Commit message:
Fix saveloading of interactive player's viewport

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1784122 in widelands: "When new singleplayer game is started, the viewport is on (0, 0)"
  https://bugs.launchpad.net/widelands/+bug/1784122

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1784122-singleplayer-viewport/+merge/353391
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784122-singleplayer-viewport into lp:widelands.

=== modified file 'src/game_io/game_interactive_player_packet.cc'
--- src/game_io/game_interactive_player_packet.cc	2018-07-08 15:16:16 +0000
+++ src/game_io/game_interactive_player_packet.cc	2018-08-20 07:44:00 +0000
@@ -59,7 +59,11 @@
 				if (player_number > max)
 					throw GameDataError("The game has no players!");
 			}
-			Vector2f center_map_pixel(fr.float_32(), fr.float_32());
+
+			Vector2f center_map_pixel = Vector2f::zero();
+			center_map_pixel.x = fr.float_32();
+			center_map_pixel.y = fr.float_32();
+
 			uint32_t const display_flags = fr.unsigned_32();
 
 			if (InteractiveBase* const ibase = game.get_ibase()) {