Merge lp:~widelands-dev/widelands/bug-1293158 into lp:widelands

[GunChleoc]

Got rid of a garbage string

[SirVer (sirver)]

A bunch of small nits.

review: Needs Fixing

[GunChleoc (gunchleoc)]

Some comments to the nits.

[GunChleoc (gunchleoc)]

Added some fixes + more comments.

[SirVer (sirver)]

review: Approve

[SirVer (sirver)]

the inline comment is rather cumbersome with saving....

review: Approve

[Tino (tino79)]

Still shows a box character under Map:->Players:
Tested with "Crossing the horizon"

review: Needs Fixing

[GunChleoc (gunchleoc)]

> Still shows a box character under Map:->Players:
> Tested with "Crossing the horizon"

I know, but I haven't the foggiest why. Somebody else will have to fix this.

If nobody wants to take on this branch, can we merge and open a new bug?

[SirVer (sirver)]

the problem was that number of players is a uchar (i.e. 0 <= uchar <= 255). Boost::format() likes to interpret this though as a 'single char'. I merged this and static_cast<int>() the value in question and all is good.

[GunChleoc (gunchleoc)]

Thanks :)

=== modified file 'src/editor/tools/editor_info_tool.cc'
--- src/editor/tools/editor_info_tool.cc	2014-06-18 13:20:33 +0000
+++ src/editor/tools/editor_info_tool.cc	2014-07-11 17:42:02 +0000
@@ -48,16 +48,11 @@
 	Widelands::Field & f = map[center.node];
 
 	// *** Node info
-	char buf1[1024];
 	std::string buf = _("Node:");
 	buf += "\n";
-	buf += std::string("• ") + (boost::format(_("Coordinates: (%1$i, %2$i)"))
+	buf += "• " + (boost::format(_("Coordinates: (%1$i, %2$i)"))
 					 % center.node.x % center.node.y).str() + "\n";
 
-	buf += std::string("• ");
-	buf += buf1;
-	buf += std::string("\n");
-
 	std::string temp = "";
 	Widelands::NodeCaps const caps = f.nodecaps();
 	switch (caps & Widelands::BUILDCAPS_SIZEMASK) {
@@ -82,15 +77,21 @@
 
 	buf += std::string("• ") + (boost::format(_("Caps:%s")) % temp).str() + "\n";
 
-	buf += std::string("• ");
-	snprintf(buf1, sizeof(buf1), _("Owned by %i"), f.get_owned_by());
-	buf += std::string(buf1) + "\n";
+	if(f.get_owned_by() > 0) {
+		buf += std::string("• ");
+		char buf1[1024];
+		snprintf(buf1, sizeof(buf1), _("Owned by: %u"), f.get_owned_by());
+		buf += std::string(buf1) + "\n";
+	}
+	else {
+		buf += std::string("• ") + _("Owned by: —") + "\n";
+	}
 
 	temp = f.get_immovable() ? _("Has base immovable") : _("No base immovable");
-	buf += std::string("• ") + temp + "\n";
+	buf += "• " + temp + "\n";
 
 	temp = f.get_first_bob() ? _("Has bobs") : _("No bobs");
-	buf += std::string("• ") + temp + "\n";
+	buf += "• " + temp + "\n";
 
 	// *** Terrain info
 	buf += std::string("\n") + _("Terrain:") + "\n";
@@ -99,8 +100,8 @@
 	const Widelands::TerrainDescription& ter = world.terrain_descr(
 	   center.triangle.t == Widelands::TCoords<>::D ? tf.terrain_d() : tf.terrain_r());
 
-	buf += std::string("• ") + (boost::format(_("Name: %s")) % ter.descname()).str() + "\n";
-	buf += std::string("• ") + (boost::format(_("Texture Number: %i")) % ter.get_texture()).str() + "\n";
+	buf += "• " + (boost::format(_("Name: %s")) % ter.descname()).str() + "\n";
+	buf += "• " + (boost::format(_("Texture Number: %i")) % ter.get_texture()).str() + "\n";
 
 	// *** Resources info
 	buf += std::string("\n") + _("Resources:") + "\n";
@@ -109,28 +110,30 @@
 	int ramount = f.get_resources_amount();
 
 	if (ramount > 0) {
-		buf += std::string("• ") + (boost::format(
+		buf += "• " + (boost::format(
 				_("Resource name: %s")) % world.get_resource(ridx)->name().c_str()
 			).str() + "\n";
-		buf += std::string("• ") + (boost::format(_("Resource amount: %i")) % ramount).str() + "\n";
+		buf += "• " + (boost::format(_("Resource amount: %i")) % ramount).str() + "\n";
 	}
-	else
-	{
-		buf += std::string("• ") + std::string(_("No resources")) + "\n";
+	else {
+		buf += "• " + std::string(_("No resources")) + "\n";
 	}
 
 	// *** Map info
 	buf += std::string("\n") + _("Map:") + "\n";
-	buf += std::string("• ") + (boost::format(_("Name: %s")) % map.get_name()).str() + "\n";
-	buf += std::string("• ") + (boost::format(_("Size: %1$ix%2$i"))
+	buf += "• " + (boost::format(_("Name: %s")) % map.get_name()).str() + "\n";
+	buf += "• " + (boost::format(_("Size: %1$ix%2$i"))
 					 % map.get_width() % map.get_height()).str() + "\n";
 
-	buf += std::string("• ");
-	snprintf(buf1, sizeof(buf1), _("Players: %i"), map.get_nrplayers());
+	if (map.get_nrplayers() > 0) {
+		buf += "• " + (boost::format(_("Players: %u")) % map.get_nrplayers()).str() + "\n";
+	}
+	else {
+		buf += "• " + (boost::format(_("Players: %s")) % "—").str() + "\n";
+	}
 
-	buf += std::string(buf1) + "\n";
-	buf += std::string("• ") + (boost::format(_("Author: %s")) % map.get_author()).str() + "\n";
-	buf += std::string("• ") + (boost::format(_("Descr: %s")) % map.get_description()).str() + "\n";
+	buf += "• " + (boost::format(_("Author: %s")) % map.get_author()).str() + "\n";
+	buf += "• " + (boost::format(_("Descr: %s")) % map.get_description()).str() + "\n";
 
 	multiline_textarea->set_text(buf.c_str());