widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1565429-client-version into lp:widelands.

Commit message:
Display Widelands version for each client in internet lobby.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1565429 in widelands: "Clients online should list the client version"
  https://bugs.launchpad.net/widelands/+bug/1565429

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1565429-client-version/+merge/292476

See commit message.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1565429-client-version into lp:widelands.

=== modified file 'src/network/internet_gaming.h'
--- src/network/internet_gaming.h	2016-02-25 08:47:48 +0000
+++ src/network/internet_gaming.h	2016-04-21 08:09:55 +0000
@@ -41,7 +41,7 @@
 	std::string   build_id;
 	std::string   game;
 	std::string   type;
-	std::string   points;
+	std::string   points; // Currently unused
 };
 
 /// A simple network game struct

=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc	2016-04-05 07:51:48 +0000
+++ src/ui_fsmenu/internet_lobby.cc	2016-04-21 08:09:55 +0000
@@ -142,7 +142,7 @@
 	clientsonline_list_ .add_column(22, "*", t_tip);
 	/** TRANSLATORS: Player Name */
 	clientsonline_list_ .add_column((lisw_ - 22) * 3 / 8, pgettext("player", "Name"));
-	clientsonline_list_ .add_column((lisw_ - 22) * 2 / 8, _("Points"));
+	clientsonline_list_ .add_column((lisw_ - 22) * 2 / 8, _("Version"));
 	clientsonline_list_ .add_column((lisw_ - 22) * 3 / 8, _("Game"));
 	clientsonline_list_.set_column_compare
 		(0, boost::bind(&FullscreenMenuInternetLobby::compare_clienttype, this, _1, _2));
@@ -273,7 +273,7 @@
 			const InternetClient& client(clients->at(i));
 			UI::Table<const InternetClient * const>::EntryRecord & er = clientsonline_list_.add(&client);
 			er.set_string(1, client.name);
-			er.set_string(2, client.points);
+			er.set_string(2, client.build_id);
 			er.set_string(3, client.game);
 
 			const Image* pic;