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

[TiborB]

This adds information about height into bottom right corner - next to x,y coordinates, hope you will find this useful.

[GunChleoc (gunchleoc)]

draw_overlay needs to know if it's drawing for the editor or for a game/replay. I don't know how the control flow is here and what is accessible from the function; you might need to add a function parameter.

Some more comments in the diff.

review: Needs Fixing

[TiborB (tiborb95)]

Hey, I implemented your comments. Also now the height is shown only in editor.

[TiborB (tiborb95)]

Also, I can see that the elapsed time is shown in editor - is it needed?

[GunChleoc (gunchleoc)]

No, that was just me being lazy when I added it to the debug screen.

[TiborB (tiborb95)]

OK, going to hide it

[GunChleoc (gunchleoc)]

I have had a liik at the code now - maybe you could move the dst.blit( part outside the if/else again, this way we get less code. const std::string node_text will then also need to be declared outside and lose the const.

When you remove the gametime from the editor, don't forget to move the FPS up to the (5,5) coordinate for the editor only.

[TiborB (tiborb95)]

@GunChleoc: done, can check it now :)

[GunChleoc (gunchleoc)]

LGTM, except for a couple more nits. One functionality change:

- In the editor, remove the blank space between ( and the first coordinate

And two code style nits:

- add operator padding to (is_game)?25:5 (codecheck doesn't catch this case, but it should look like this: (is_game) ? 25 : 5)

- Properly align the closing parenthesis for dst.blit(. It should either be where it was, or at the end of the last parameter - I think the last option is preferred.

[TiborB (tiborb95)]

re: "- In the editor, remove the blank space between ( and the first coordinate"

Talking about this line?

static boost::format node_format("(%3i, %3i, %2i)");

Because there is no space. But I can say that numbers between % and i are flatly ignored, if you know how to make them work...

[GunChleoc (gunchleoc)]

They are, except for the first variable. That looks weird, so I have removed it. Going to merge now.

review: Approve

[TiborB (tiborb95)]

OK, and thanks for saving me from this work, I am struggling with that LUA testing now...

[GunChleoc (gunchleoc)]

No problem. Let me know if you need help with the Lua tests, I have written a few simple ones for the building descriptions.

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2014-11-24 07:25:21 +0000
+++ src/wui/interactive_base.cc	2014-11-27 11:20:36 +0000
@@ -406,21 +406,37 @@
 */
 void InteractiveBase::draw_overlay(RenderTarget& dst) {
 
+	const Map & map = egbase().map();
+	const bool is_game = dynamic_cast<const Game*>(&egbase());
+
 	// Blit node information when in debug mode.
-	if (get_display_flag(dfDebug) || !dynamic_cast<const Game*>(&egbase())) {
-		const std::string gametime(gametimestring(egbase().get_gametime()));
-		const std::string gametime_text = as_uifont(gametime, UI_FONT_SIZE_SMALL);
-		dst.blit(Point(5, 5), UI::g_fh1->render(gametime_text), BlendMode::UseAlpha, UI::Align_TopLeft);
-		static boost::format node_format("(%i, %i)");
-
-		const std::string node_text = as_uifont
-			((node_format % m_sel.pos.node.x % m_sel.pos.node.y).str(), UI_FONT_SIZE_SMALL);
+	if (get_display_flag(dfDebug) || !is_game) {
+
+		std::string node_text;
+
+		if (is_game) {
+
+			const std::string gametime(gametimestring(egbase().get_gametime()));
+			const std::string gametime_text = as_uifont(gametime, UI_FONT_SIZE_SMALL);
+			dst.blit(Point(5, 5), UI::g_fh1->render(gametime_text), BlendMode::UseAlpha, UI::Align_TopLeft);
+
+			static boost::format node_format("(%i, %i)");
+			node_text = as_uifont
+				((node_format % m_sel.pos.node.x % m_sel.pos.node.y).str(), UI_FONT_SIZE_SMALL);
+
+		} else { //this is an editor
+
+			static boost::format node_format("(%i, %i, %i)");
+			const int32_t height = map[m_sel.pos.node].get_height();
+			node_text = as_uifont
+				((node_format % m_sel.pos.node.x % m_sel.pos.node.y % height).str(), UI_FONT_SIZE_SMALL);
+		}
+
 		dst.blit(
 			Point(get_w() - 5, get_h() - 5),
 			UI::g_fh1->render(node_text),
 			BlendMode::UseAlpha,
-			UI::Align_BottomRight
-		);
+			UI::Align_BottomRight);
 	}
 
 	// Blit FPS when in debug mode.
@@ -430,7 +446,7 @@
 			((fps_format %
 			  (1000.0 / m_frametime) % (1000.0 / (m_avg_usframetime / 1000)))
 			 .str(), UI_FONT_SIZE_SMALL);
-		dst.blit(Point(5, 25), UI::g_fh1->render(fps_text), BlendMode::UseAlpha, UI::Align_Left);
+		dst.blit(Point(5, (is_game) ? 25 : 5), UI::g_fh1->render(fps_text), BlendMode::UseAlpha, UI::Align_Left);
 	}
 }