Author: suokko
Date: Mon Sep 1 22:39:08 2008
New Revision: 29171
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29171&view=rev
Log:
Backported: Fixed MP saves to transfer correct completion state to remote
clients when loadin game (bug #10385)
Modified:
branches/1.4/changelog
branches/1.4/src/menu_events.cpp
branches/1.4/src/multiplayer_connect.cpp
branches/1.4/src/multiplayer_ui.cpp
Modified: branches/1.4/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/changelog?rev=29171&r1=29170&r2=29171&view=diff
==============================================================================
--- branches/1.4/changelog (original)
+++ branches/1.4/changelog Mon Sep 1 22:39:08 2008
@@ -16,6 +16,8 @@
* Fixed crash when ai moves units next to level 0 hiden unit (bug #12252)
* Fixed loading ai parameters. MP side defination now overwrites
era values (bug #12171)
+ * Fixed MP saves to transfer correct completion state to remote clients
+ when loadin game (bug #10385)
Version 1.4.4:
* language and i18n:
Modified: branches/1.4/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/menu_events.cpp?rev=29171&r1=29170&r2=29171&view=diff
==============================================================================
--- branches/1.4/src/menu_events.cpp (original)
+++ branches/1.4/src/menu_events.cpp Mon Sep 1 22:39:08 2008
@@ -859,6 +859,7 @@
sound::write_music_play_list(start);
write_game(gamestate_, start, WRITE_SNAPSHOT_ONLY);
+ start["completion"] = gamestate_.completion;
/*
// 29.11.07, YogiHH: I can't see why this is needed at all and it
Modified: branches/1.4/src/multiplayer_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/multiplayer_connect.cpp?rev=29171&r1=29170&r2=29171&view=diff
==============================================================================
--- branches/1.4/src/multiplayer_connect.cpp (original)
+++ branches/1.4/src/multiplayer_connect.cpp Mon Sep 1 22:39:08 2008
@@ -1472,6 +1472,7 @@
level_["map_data"] = start_data["map_data"];
level_["id"] = start_data["id"];
level_["name"] = start_data["name"];
+ level_["completion"] = start_data["completion"];
// Probably not needed.
level_["turn"] = start_data["turn_at"];
level_["turn_at"] = start_data["turn_at"];
Modified: branches/1.4/src/multiplayer_ui.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/multiplayer_ui.cpp?rev=29171&r1=29170&r2=29171&view=diff
==============================================================================
--- branches/1.4/src/multiplayer_ui.cpp (original)
+++ branches/1.4/src/multiplayer_ui.cpp Mon Sep 1 22:39:08 2008
@@ -117,6 +117,7 @@
level["campaign_type"] = "multiplayer";
state.campaign_type = "multiplayer";
+ state.completion = level["completion"];
state.version = level["version"];
const config* const vars = level.child("variables");
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
