Fixed issue caused by merges

This commit is contained in:
Kayne Ruse
2015-01-20 22:43:47 +11:00
parent 453a211343
commit 65f23bbd1a
+3 -2
View File
@@ -22,7 +22,6 @@
#include "in_world.hpp" #include "in_world.hpp"
#include "channels.hpp" #include "channels.hpp"
#include "utility.hpp"
#include "terminal_error.hpp" #include "terminal_error.hpp"
#include <stdexcept> #include <stdexcept>
@@ -185,7 +184,9 @@ void InWorld::Render(SDL_Surface* const screen) {
//draw UI //draw UI
disconnectButton.DrawTo(screen); disconnectButton.DrawTo(screen);
shutDownButton.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);
} }
//------------------------- //-------------------------