From 65f23bbd1aad9e590d33406c58d401cbd6e93609 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Tue, 20 Jan 2015 22:43:47 +1100
Subject: [PATCH] Fixed issue caused by merges

---
 client/gameplay_scenes/in_world_scene.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/gameplay_scenes/in_world_scene.cpp b/client/gameplay_scenes/in_world_scene.cpp
index 55ed44d..284d892 100644
--- a/client/gameplay_scenes/in_world_scene.cpp
+++ b/client/gameplay_scenes/in_world_scene.cpp
@@ -22,7 +22,6 @@
 #include "in_world.hpp"
 
 #include "channels.hpp"
-#include "utility.hpp"
 
 #include "terminal_error.hpp"
 #include <stdexcept>
@@ -185,7 +184,9 @@ void InWorld::Render(SDL_Surface* const screen) {
 	//draw UI
 	disconnectButton.DrawTo(screen);
 	shutDownButton.DrawTo(screen);
-	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
+	std::ostringstream msg;
+	msg << fps.GetFrameRate();
+	font.DrawStringTo(msg.str(), screen, 0, 0);
 }
 
 //-------------------------