From 25a7e1dcd654ea9546e35b23e57a078fbd5497c1 Mon Sep 17 00:00:00 2001
From: uso <uso>
Date: Mon, 28 Jan 2008 22:43:31 +0000
Subject: [PATCH] don't display 'Remote scenario' for reloaded games in the
 multiplayer lobby

which is wrong in most cases (fixes bug #10882), the display of
'Reloaded game' is disabled for now because we have a string freeze
and there is no good string to re-use
---
 changelog                 | 4 ++++
 src/multiplayer_lobby.cpp | 9 ++++++++-
 src/server/server.cpp     | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 65d2bdbe7f8..c08799418e5 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,10 @@
 Version 1.3.15+svn:
  * language and i18n:
     * updated translations: Filipino, German
+ * multiplayer:
+    * don't display 'Remote scenario' for reloaded games in the multiplayer
+      lobby which is wrong in most cases (fixes bug #10882), the display
+      of 'Reloaded game' is disabled for now because of the string freeze
 
 Version 1.3.15:
  * language and i18n:
diff --git a/src/multiplayer_lobby.cpp b/src/multiplayer_lobby.cpp
index 8fc4d089788..299f12e2e0f 100644
--- a/src/multiplayer_lobby.cpp
+++ b/src/multiplayer_lobby.cpp
@@ -450,7 +450,14 @@ void gamebrowser::set_game_items(const config& cfg, const config& game_config)
 			}
 			if(level_cfg) {
 				games_.back().map_info += level_cfg->get_attribute("name");
-				if(map_hashes_) {
+				if ((**game)["savegame"] == "yes") {
+					//! @todo: display of 'Reloaded game' in the MP lobby is
+					// deactivated for now because we have a string freeze and
+					// there is no good string to re-use
+					//games_.back().map_info += " - ";
+					//games_.back().map_info += _("Reloaded game");
+					verified = false;
+				} else if (map_hashes_) {
 					const std::string& hash = (**game)["hash"];
 					bool hash_found = false;
 					for(string_map::const_iterator i = map_hashes_->values.begin(); i != map_hashes_->values.end(); ++i) {
diff --git a/src/server/server.cpp b/src/server/server.cpp
index 035cc814843..26bf8a7d859 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -1030,6 +1030,7 @@ void server::process_data_game(const network::connection sock, const config& dat
 		desc["mp_countdown_turn_bonus"] = data["mp_countdown_turn_bonus"];
 		desc["mp_countdown_reservoir_time"] = data["mp_countdown_reservoir_time"];
 		desc["mp_countdown_action_bonus"] = data["mp_countdown_action_bonus"];
+		desc["savegame"] = data["savegame"];
 		desc["hash"] = data["hash"];
 		//desc["map_name"] = data["name"];
 		//desc["map_description"] = data["description"];