diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-11-17 15:51:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 15:51:33 -0600 |
| commit | b155ab8488cdd280d1b84ceaf0cd9fbff671a357 (patch) | |
| tree | 5f8c22b020feae728dcfd98a853533f6656f02cf | |
| parent | 0356165d82a1b1ee0eb8572296ba18f615c516aa (diff) | |
| parent | 0c382eea7dd3f4cbbeea120bdb1b764cef8e89db (diff) | |
Merge pull request #342 from AttorneyOnline/charselect-sounds
Fix #277 (sounds in charselect)
| -rw-r--r-- | src/charselect.cpp | 2 | ||||
| -rw-r--r-- | src/packet_distribution.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/charselect.cpp b/src/charselect.cpp index b5439340..f8c622da 100644 --- a/src/charselect.cpp +++ b/src/charselect.cpp @@ -148,8 +148,6 @@ void Courtroom::char_clicked(int n_char) else update_character(n_char); - enter_courtroom(); - if (n_char != -1) ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name); } diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index f7125797..1ffbcafa 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -460,6 +460,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet) if (f_contents.size() < 3) goto end; + w_courtroom->enter_courtroom(); + if (courtroom_constructed) w_courtroom->update_character(f_contents.at(2).toInt()); } |
