Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loading lost in translation

Browse Source
This commit is contained in:
sD 2020-02-23 12:59:20 +01:00
parent 1d10cf1a08
commit ea099a5141
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/courtroom.cpp
View File

@ -2835,7 +2835,7 @@ void Courtroom::set_ban(int p_cid)
if (p_cid != m_cid && p_cid != -1) if (p_cid != m_cid && p_cid != -1)
return; return;
call_notice("You have been banned."); call_notice(tr("You have been banned."));
ao_app->construct_lobby(); ao_app->construct_lobby();
ao_app->destruct_courtroom(); ao_app->destruct_courtroom();

4
src/packet_distribution.cpp
View File

@ -350,7 +350,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
++loaded_chars; ++loaded_chars;
w_lobby->set_loading_text("Loading chars:\n" + QString::number(loaded_chars) + "/" + QString::number(char_list_size)); w_lobby->set_loading_text(tr("Loading chars:\n%1/%2").arg(QString::number(loaded_chars)).arg(QString::number(char_list_size)));
w_courtroom->append_char(f_char); w_courtroom->append_char(f_char);
@ -535,7 +535,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
int total_loading_size = char_list_size * 2 + evidence_list_size + music_list_size; int total_loading_size = char_list_size * 2 + evidence_list_size + music_list_size;
int loading_value = int(((loaded_chars + generated_chars + loaded_music + loaded_evidence) / static_cast<double>(total_loading_size)) * 100); int loading_value = int(((loaded_chars + generated_chars + loaded_music + loaded_evidence) / static_cast<double>(total_loading_size)) * 100);
w_lobby->set_loading_value(loading_value); w_lobby->set_loading_value(loading_value);
w_lobby->set_loading_text("Loading music:\n" + QString::number(loaded_music) + "/" + QString::number(music_list_size)); w_lobby->set_loading_text(tr("Loading music:\n%1/%2").arg(QString::number(loaded_music)).arg(QString::number(music_list_size)));
if(QThreadPool::globalInstance()->activeThreadCount() == QThreadPool::globalInstance()->maxThreadCount()) if(QThreadPool::globalInstance()->activeThreadCount() == QThreadPool::globalInstance()->maxThreadCount())
{ {
QThreadPool::globalInstance()->waitForDone(); //out of order music is bad QThreadPool::globalInstance()->waitForDone(); //out of order music is bad