Merge lp:~widelands-dev/widelands/bug-1798812-replay-savegame-type into lp:widelands

[GunChleoc]

Fix bugs when loading a savegame saved from a replay

- Show replays in single player load screen
- Set win condition display name when loading a replay.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4158. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/444318487.
Appveyor build 3955. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1798812_replay_savegame_type-3955.

[Notabilis (notabilis27)]

Code is looking good and the game appears in the load menu.

Two issues:
- My single player replay savegame also shows up in the multiplayer load game screen (even before this change). Not that much of an issue, might even be intentional?
- The savegame isn't shown in the "save game" dialog. So I can load a game but when saving later on it isn't shown any longer (Huh? Where did it go?). Saving without seeing the game in the save dialog will trigger an "really override" message (Huh? For which game?), but after saving it once it will correctly appear in the list.

[GunChleoc (gunchleoc)]

1. Replays don't know if the came from a single or multiplayer game, so we can't filter for that here.
2. Good point, needs fixing

[GunChleoc (gunchleoc)]

Save game screen should be fixed now

review: Needs Resubmitting

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4165. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/445997183.
Appveyor build 3963. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1798812_replay_savegame_type-3963.

[Notabilis (notabilis27)]

Looking good now, thanks!

review: Approve

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2018-09-08 08:19:51 +0000
+++ src/logic/game.cc	2018-10-25 04:01:54 +0000
@@ -851,6 +851,13 @@
 	return static_cast<LuaGameInterface&>(EditorGameBase::lua());
 }
 
+const std::string& Game::get_win_condition_displayname() const {
+	return win_condition_displayname_;
+}
+void Game::set_win_condition_displayname(const std::string& name) {
+	win_condition_displayname_ = name;
+}
+
 /**
  * Sample global statistics for the game.
  */

=== modified file 'src/logic/game.h'
--- src/logic/game.h	2018-09-08 08:19:51 +0000
+++ src/logic/game.h	2018-10-25 04:01:54 +0000
@@ -244,9 +244,8 @@
 
 	void sample_statistics();
 
-	const std::string& get_win_condition_displayname() {
-		return win_condition_displayname_;
-	}
+	const std::string& get_win_condition_displayname() const;
+	void set_win_condition_displayname(const std::string& name);
 
 	bool is_replay() const {
 		return replay_;

=== modified file 'src/logic/replay.cc'
--- src/logic/replay.cc	2018-04-07 16:59:00 +0000
+++ src/logic/replay.cc	2018-10-25 04:01:54 +0000
@@ -23,6 +23,7 @@
 #include "base/md5.h"
 #include "base/wexception.h"
 #include "game_io/game_loader.h"
+#include "game_io/game_preload_packet.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "io/streamread.h"
 #include "io/streamwrite.h"
@@ -82,6 +83,9 @@
 
 	{
 		GameLoader gl(filename + kSavegameExtension, game);
+		Widelands::GamePreloadPacket gpdp;
+		gl.preload_game(gpdp);
+		game.set_win_condition_displayname(gpdp.get_win_condition());
 		gl.load_game();
 	}
 

=== modified file 'src/wui/game_main_menu_save_game.cc'
--- src/wui/game_main_menu_save_game.cc	2018-06-01 08:50:29 +0000
+++ src/wui/game_main_menu_save_game.cc	2018-10-25 04:01:54 +0000
@@ -55,7 +55,7 @@
      info_box_(&main_box_, 0, 0, UI::Box::Horizontal),
 
      load_or_save_(
-        &info_box_, igbase().game(), LoadOrSaveGame::FileType::kGame, UI::PanelStyle::kWui, false),
+        &info_box_, igbase().game(), LoadOrSaveGame::FileType::kShowAll, UI::PanelStyle::kWui, false),
 
      filename_box_(load_or_save_.table_box(), 0, 0, UI::Box::Horizontal),
      filename_label_(&filename_box_, 0, 0, 0, 0, _("Filename:"), UI::Align::kLeft),

=== modified file 'src/wui/load_or_save_game.cc'
--- src/wui/load_or_save_game.cc	2018-07-15 11:33:09 +0000
+++ src/wui/load_or_save_game.cc	2018-10-25 04:01:54 +0000
@@ -341,15 +341,11 @@
 			gamedata.gametype = gpdp.get_gametype();
 
 			if (filetype_ != FileType::kReplay) {
-				if (filetype_ == FileType::kGame) {
-					if (gamedata.gametype == GameController::GameType::kReplay) {
-						continue;
-					}
-				} else if (filetype_ == FileType::kGameMultiPlayer) {
+				if (filetype_ == FileType::kGameMultiPlayer) {
 					if (gamedata.gametype == GameController::GameType::kSingleplayer) {
 						continue;
 					}
-				} else if (gamedata.gametype > GameController::GameType::kSingleplayer) {
+				} else if ((gamedata.gametype != GameController::GameType::kSingleplayer) && (gamedata.gametype != GameController::GameType::kReplay)) {
 					continue;
 				}
 			}

=== modified file 'src/wui/load_or_save_game.h'
--- src/wui/load_or_save_game.h	2018-05-14 08:33:24 +0000
+++ src/wui/load_or_save_game.h	2018-10-25 04:01:54 +0000
@@ -35,7 +35,7 @@
 
 protected:
 	/// Choose which type of files to show
-	enum class FileType { kReplay, kGame, kGameMultiPlayer, kGameSinglePlayer };
+	enum class FileType { kShowAll, kGameMultiPlayer, kGameSinglePlayer, kReplay };
 
 	/// A table of savegame/replay files and a game details panel.
 	LoadOrSaveGame(UI::Panel* parent,