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

Fixed a crash caused by /charselect.

Browse Source
This commit is contained in:
Cerapter 2018-08-28 21:35:36 +02:00
parent 7aac266b9b
commit 712b683fd5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charselect.cpp
View File

@ -177,6 +177,7 @@ void Courtroom::put_button_in_place(int starting, int chars_on_this_page)
void Courtroom::character_loading_finished() void Courtroom::character_loading_finished()
{ {
// Zeroeth, we'll clear any leftover characters from previous server visits. // Zeroeth, we'll clear any leftover characters from previous server visits.
ao_app->generated_chars = 0;
if (ui_char_button_list.size() > 0) if (ui_char_button_list.size() > 0)
{ {
foreach (AOCharButton* item, ui_char_button_list) { foreach (AOCharButton* item, ui_char_button_list) {
@ -201,12 +202,15 @@ void Courtroom::character_loading_finished()
// This part here serves as a way of showing to the player that the game is still running, it is // This part here serves as a way of showing to the player that the game is still running, it is
// just loading the pictures of the characters. // just loading the pictures of the characters.
if (ao_app->lobby_constructed)
{
ao_app->generated_chars++; ao_app->generated_chars++;
int total_loading_size = ao_app->char_list_size * 2 + ao_app->evidence_list_size + ao_app->music_list_size; int total_loading_size = ao_app->char_list_size * 2 + ao_app->evidence_list_size + ao_app->music_list_size;
int loading_value = int(((ao_app->loaded_chars + ao_app->generated_chars + ao_app->loaded_music + ao_app->loaded_evidence) / static_cast<double>(total_loading_size)) * 100); int loading_value = int(((ao_app->loaded_chars + ao_app->generated_chars + ao_app->loaded_music + ao_app->loaded_evidence) / static_cast<double>(total_loading_size)) * 100);
ao_app->w_lobby->set_loading_value(loading_value); ao_app->w_lobby->set_loading_value(loading_value);
ao_app->w_lobby->set_loading_text("Generating chars:\n" + QString::number(ao_app->generated_chars) + "/" + QString::number(ao_app->char_list_size)); ao_app->w_lobby->set_loading_text("Generating chars:\n" + QString::number(ao_app->generated_chars) + "/" + QString::number(ao_app->char_list_size));
} }
}
filter_character_list(); filter_character_list();
} }