Merge pull request #342 from AttorneyOnline/charselect-sounds
Fix #277 (sounds in charselect)
This commit is contained in:
commit
b155ab8488
@ -148,8 +148,6 @@ void Courtroom::char_clicked(int n_char)
|
|||||||
else
|
else
|
||||||
update_character(n_char);
|
update_character(n_char);
|
||||||
|
|
||||||
enter_courtroom();
|
|
||||||
|
|
||||||
if (n_char != -1)
|
if (n_char != -1)
|
||||||
ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name);
|
ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name);
|
||||||
}
|
}
|
||||||
|
@ -460,6 +460,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
|
|||||||
if (f_contents.size() < 3)
|
if (f_contents.size() < 3)
|
||||||
goto end;
|
goto end;
|
||||||
|
|
||||||
|
w_courtroom->enter_courtroom();
|
||||||
|
|
||||||
if (courtroom_constructed)
|
if (courtroom_constructed)
|
||||||
w_courtroom->update_character(f_contents.at(2).toInt());
|
w_courtroom->update_character(f_contents.at(2).toInt());
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user