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

Fix the objection_stop_music option not doing anything

Browse Source 
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
This commit is contained in:
Crystalwarrior 2019-09-14 00:48:07 +03:00
parent 4645d9dd08
commit 4b452e968d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/courtroom.cpp
View File

@ -1408,6 +1408,8 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
case 2: case 2:
ui_vp_objection->play("objection", f_char, f_custom_theme, 724); ui_vp_objection->play("objection", f_char, f_custom_theme, 724);
objection_player->play("objection.wav", f_char, f_custom_theme); objection_player->play("objection.wav", f_char, f_custom_theme);
if(ao_app->objection_stop_music())
music_player->stop();
break; break;
case 3: case 3:
ui_vp_objection->play("takethat", f_char, f_custom_theme, 724); 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. // If there is no second character, hide 'em, and center the first.
ui_vp_sideplayer_char->hide(); ui_vp_sideplayer_char->hide();
ui_vp_sideplayer_char->stop();
ui_vp_sideplayer_char->move(0,0); ui_vp_sideplayer_char->move(0,0);
ui_vp_player_char->move(0,0); ui_vp_player_char->move(0,0);

7
src/packet_distribution.cpp
View File

@ -109,13 +109,6 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
destruct_courtroom(); destruct_courtroom();
destruct_lobby(); 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: end: