Merge lp:~widelands-dev/widelands/bug-1629691-make-empty-ai-empty into lp:widelands

[GunChleoc]

Set AI from selection in UI when saveloading

The bug is that when loading a savegame, the AI selected in the interface by the user was completely ignored. This overwrites the AI setting from the savegame when starting a savegame.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3662. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/402968399.
Appveyor build 3461. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1629691_make_empty_ai_empty-3461.

[Notabilis (notabilis27)]

Change is looking good and seems to be working as expected.
Am I right that this is only relevant for loading multiplayer games, since in single player you are unable to change positions?

Independent of your change, I am a bit puzzled about this part:

} catch (...) {
  throw;
}

Isn't it completely useless and couldn't the whole try{} block be removed? Or am I missing something?

review: Approve (diff, test)

[GunChleoc (gunchleoc)]

It does look like it's completely useless, because it's sitting at the bottom end of the function. I am on the road again though and can't test if it makes a difference, so I'll leave it in for now.

Thanks for the review :)

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2018-05-27 06:02:18 +0000
+++ src/logic/game.cc	2018-07-17 13:37:22 +0000
@@ -337,6 +337,13 @@
 		loader_ui->set_background(background);
 		loader_ui->step(_("Loading…"));
 		gl.load_game(settings.multiplayer);
+		// Players might have selected a different AI type
+		for (uint8_t i = 0; i < settings.players.size(); ++i) {
+			const PlayerSettings& playersettings = settings.players[i];
+			if (playersettings.state == PlayerSettings::State::kComputer) {
+				get_player(i + 1)->set_ai(playersettings.ai);
+			}
+		}
 	} catch (...) {
 		throw;
 	}