aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/client.cpp8
-rw-r--r--src/client/game.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 13ff22e8e..45cc62a33 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1693,13 +1693,13 @@ float Client::mediaReceiveProgress()
return 1.0; // downloader only exists when not yet done
}
-typedef struct TextureUpdateArgs {
+struct TextureUpdateArgs {
gui::IGUIEnvironment *guienv;
u64 last_time_ms;
u16 last_percent;
const wchar_t* text_base;
ITextureSource *tsrc;
-} TextureUpdateArgs;
+};
void Client::showUpdateProgressTexture(void *args, u32 progress, u32 max_progress)
{
@@ -1718,8 +1718,8 @@ void Client::showUpdateProgressTexture(void *args, u32 progress, u32 max_progres
if (do_draw) {
targs->last_time_ms = time_ms;
- std::basic_stringstream<wchar_t> strm;
- strm << targs->text_base << " " << targs->last_percent << "%...";
+ std::wostringstream strm;
+ strm << targs->text_base << L" " << targs->last_percent << L"%...";
m_rendering_engine->draw_load_screen(strm.str(), targs->guienv, targs->tsrc, 0,
72 + (u16) ((18. / 100.) * (double) targs->last_percent), true);
}
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 18df5cc58..a24ded844 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1618,7 +1618,7 @@ bool Game::getServerContent(bool *aborted)
dtime, progress);
delete[] text;
} else {
- std::stringstream message;
+ std::ostringstream message;
std::fixed(message);
message.precision(0);
float receive = client->mediaReceiveProgress() * 100;