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

Made case announcement use netcode instead of calling tsuserver commands.

Browse Source
This commit is contained in:
Cerapter 2018-12-14 19:53:53 +01:00
parent a852ab504b
commit 9b8173a1f9
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aocaseannouncerdialog.cpp
View File

@ -19,7 +19,7 @@ AOCaseAnnouncerDialog::AOCaseAnnouncerDialog(QWidget *parent, AOApplication *p_a
ui_announcer_buttons->setOrientation(Qt::Horizontal); ui_announcer_buttons->setOrientation(Qt::Horizontal);
ui_announcer_buttons->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); ui_announcer_buttons->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
QObject::connect(ui_announcer_buttons, SIGNAL(accepted()), this, SLOT(on_ok_pressed())); QObject::connect(ui_announcer_buttons, SIGNAL(accepted()), this, SLOT(ok_pressed()));
QObject::connect(ui_announcer_buttons, SIGNAL(rejected()), this, SLOT(cancel_pressed())); QObject::connect(ui_announcer_buttons, SIGNAL(rejected()), this, SLOT(cancel_pressed()));
setUpdatesEnabled(false); setUpdatesEnabled(false);

29
courtroom.cpp
View File

@ -3438,29 +3438,28 @@ void Courtroom::on_casing_clicked()
if (ao_app->casing_alerts_enabled) if (ao_app->casing_alerts_enabled)
{ {
if (ui_casing->isChecked()) if (ui_casing->isChecked())
ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/setcase" ao_app->send_server_packet(new AOPacket("SETCASE#\"" + ao_app->get_casing_can_host_cases() + "\""
+ " \"" + ao_app->get_casing_can_host_cases() + "\"" + "#" + QString::number(ao_app->get_casing_cm_enabled())
+ " " + QString::number(ao_app->get_casing_cm_enabled()) + "#" + QString::number(ao_app->get_casing_defence_enabled())
+ " " + QString::number(ao_app->get_casing_defence_enabled()) + "#" + QString::number(ao_app->get_casing_prosecution_enabled())
+ " " + QString::number(ao_app->get_casing_prosecution_enabled()) + "#" + QString::number(ao_app->get_casing_judge_enabled())
+ " " + QString::number(ao_app->get_casing_judge_enabled()) + "#" + QString::number(ao_app->get_casing_juror_enabled())
+ " " + QString::number(ao_app->get_casing_juror_enabled()) + "#" + QString::number(ao_app->get_casing_steno_enabled())
+ " " + QString::number(ao_app->get_casing_steno_enabled())
+ "#%")); + "#%"));
else else
ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/setcase \"\" 0 0 0 0 0 0#%")); ao_app->send_server_packet(new AOPacket("SETCASE#\"\"#0#0#0#0#0#0#%"));
} }
} }
void Courtroom::announce_case(QString title, bool def, bool pro, bool jud, bool jur, bool steno) void Courtroom::announce_case(QString title, bool def, bool pro, bool jud, bool jur, bool steno)
{ {
if (ao_app->casing_alerts_enabled) if (ao_app->casing_alerts_enabled)
ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/anncase \"" ao_app->send_server_packet(new AOPacket("CASEA#\""
+ title + "\" " + title + "\"#"
+ QString::number(def) + " " + QString::number(def) + "#"
+ QString::number(pro) + " " + QString::number(pro) + "#"
+ QString::number(jud) + " " + QString::number(jud) + "#"
+ QString::number(jur) + " " + QString::number(jur) + "#"
+ QString::number(steno) + QString::number(steno)
+ "#%")); + "#%"));
} }