Show RSS on Linux.

1 files changed, 18 insertions, 13 deletions

diff --git a/src/game/interface.cpp b/src/game/interface.cpp
index c6d5e19..d249f38 100644
--- a/src/game/interface.cpp
+++ b/src/game/interface.cpp
@@ -371,18 +371,19 @@ void state_t::render_to(render::state_t *render)
 		x[1] += em;
 	}
 	
-	x = v2f_t(0.0f, h - em * 5.5);
-	ss << "World S/T:";
-	ss << game->world.stats.sectors << "/";
-	ss << game->world.stats.tiles;
+	x = v2f_t(0.0f, h - em * 1.5);
+
+	ss << std::fixed << std::setprecision(3);
+	ss << "Game t/F/B: " << game->time * 1.0e-9 << "/" << game->frames << "/" << game->frames_behind;
 	render->render_text(x, em, ss.str(), render::ALIGN_LEFT_TOP, sf::Color::White);
 
-	x[1] += em;
+	x[1] -= em;
 	ss.str(std::string());
-	ss << "Awake: " << game->awake_entities.size() << "/" << game->world.stats.entities;
+	ss << std::fixed << std::setprecision(1);
+	ss << "FPS: " << fc_render.freq_ma() << ", " << fc_game.freq_ma() << " Hz";
 	render->render_text(x, em, ss.str(), render::ALIGN_LEFT_TOP, sf::Color::White);
 
-	x[1] += em;
+	x[1] -= em;
 	ss.str(std::string());
 	ss << "View S/T/E: ";
 	ss << render->stats.sectors << "/";
@@ -390,16 +391,20 @@ void state_t::render_to(render::state_t *render)
 	ss << render->stats.entities;
 	render->render_text(x, em, ss.str(), render::ALIGN_LEFT_TOP, sf::Color::White);
 
-	x[1] += em;
+	x[1] -= em;
 	ss.str(std::string());
-	ss << std::fixed << std::setprecision(1);
-	ss << "FPS: " << fc_render.freq_ma() << ", " << fc_game.freq_ma() << " Hz";
+	ss << "Awake: " << game->awake_entities.size() << "/" << game->world.stats.entities;
 	render->render_text(x, em, ss.str(), render::ALIGN_LEFT_TOP, sf::Color::White);
 
-	x[1] += em;
+	x[1] -= em;
 	ss.str(std::string());
-	ss << std::fixed << std::setprecision(3);
-	ss << "Game t/F/B: " << game->time * 1.0e-9 << "/" << game->frames << "/" << game->frames_behind;
+	ss << "World S/T:";
+	ss << game->world.stats.sectors << "/";
+	ss << game->world.stats.tiles;
+#ifdef CONFIG_SHOW_RSS
+	ss << ", " << sys_get_rss() / 1000000.0f;
+	ss << "MB RSS";
+#endif
 	render->render_text(x, em, ss.str(), render::ALIGN_LEFT_TOP, sf::Color::White);
 }