diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-09-14 00:48:07 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-09-14 00:48:07 +0300 |
| commit | 4b452e968d07d4f49f1e6e3c86ba52c6d175033c (patch) | |
| tree | 7bf97bd1cb8f8ebc8aacf0a92169adb4d5f2b24c | |
| parent | 4645d9dd080964560477e48d99812bc494c1965b (diff) | |
Fix the objection_stop_music option not doing anything
Stop the animation for the side player char in pairing so as not to affect anything
Remove the "DOOM" packet as anyone who has the source code can just remove it anyway
| -rw-r--r-- | src/courtroom.cpp | 3 | ||||
| -rw-r--r-- | src/packet_distribution.cpp | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 1435b0d4..3729c982 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1408,6 +1408,8 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) case 2: ui_vp_objection->play("objection", f_char, f_custom_theme, 724); objection_player->play("objection.wav", f_char, f_custom_theme); + if(ao_app->objection_stop_music()) + music_player->stop(); break; case 3: ui_vp_objection->play("takethat", f_char, f_custom_theme, 724); @@ -1505,6 +1507,7 @@ void Courtroom::handle_chatmessage_2() { // If there is no second character, hide 'em, and center the first. ui_vp_sideplayer_char->hide(); + ui_vp_sideplayer_char->stop(); ui_vp_sideplayer_char->move(0,0); ui_vp_player_char->move(0,0); diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index 420aea28..6059edb9 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -109,13 +109,6 @@ void AOApplication::ms_packet_received(AOPacket *p_packet) destruct_courtroom(); destruct_lobby(); } - else if (header == "DOOM") - { - call_notice(tr("You have been exiled from AO.\n" - "Have a nice day.")); - destruct_courtroom(); - destruct_lobby(); - } end: |