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

Change FL variable names for clarity (#810)

Browse Source 
* Change FL variable names for clarity

* Missed one somehow

Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
This commit is contained in:
Rosemary Witchaven 2022-07-23 10:19:00 -05:00 committed by GitHub
parent ef49b46c37
commit 8138187f92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/aoapplication.h
View File

@ -88,22 +88,22 @@ public:
/////////////////server metadata////////////////// /////////////////server metadata//////////////////
bool yellow_text_enabled = false; bool yellow_text_supported = false;
bool prezoom_enabled = false; bool prezoom_supported = false;
bool flipping_enabled = false; bool flipping_supported = false;
bool custom_objection_enabled = false; bool custom_objection_supported = false;
bool desk_mod_enabled = false; bool desk_mod_supported = false;
bool evidence_enabled = false; bool evidence_supported = false;
bool cccc_ic_support_enabled = false; bool cccc_ic_supported = false;
bool arup_enabled = false; bool arup_supported = false;
bool casing_alerts_enabled = false; bool casing_alerts_supported = false;
bool modcall_reason_enabled = false; bool modcall_reason_supported = false;
bool looping_sfx_support_enabled = false; bool looping_sfx_supported = false;
bool additive_enabled = false; bool additive_text_supported = false;
bool effects_enabled = false; bool effects_supported = false;
bool y_offset_enabled = false; bool y_offset_supported = false;
bool expanded_desk_mods_enabled = false; bool expanded_desk_mods_supported = false;
bool auth_packet_enabled = false; bool auth_packet_supported = false;
///////////////loading info/////////////////// ///////////////loading info///////////////////

2
src/aooptionsdialog.cpp
View File

@ -689,7 +689,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
// -- SERVER SUPPORTS CASING // -- SERVER SUPPORTS CASING
ui_casing_supported_lbl = new QLabel(ui_casing_widget); ui_casing_supported_lbl = new QLabel(ui_casing_widget);
if (ao_app->casing_alerts_enabled) if (ao_app->casing_alerts_supported)
ui_casing_supported_lbl->setText(tr("This server supports case alerts.")); ui_casing_supported_lbl->setText(tr("This server supports case alerts."));
else else
ui_casing_supported_lbl->setText( ui_casing_supported_lbl->setText(

66
src/courtroom.cpp
View File

@ -664,7 +664,7 @@ void Courtroom::set_widgets()
// If there is a point to it, show all CCCC features. // If there is a point to it, show all CCCC features.
// We also do this this soon so that set_size_and_pos can hide them all later, // We also do this this soon so that set_size_and_pos can hide them all later,
// if needed. // if needed.
if (ao_app->cccc_ic_support_enabled) { if (ao_app->cccc_ic_supported) {
ui_pair_button->show(); ui_pair_button->show();
ui_immediate->show(); ui_immediate->show();
ui_showname_enable->show(); ui_showname_enable->show();
@ -679,7 +679,7 @@ void Courtroom::set_widgets()
ui_ic_chat_name->setEnabled(false); ui_ic_chat_name->setEnabled(false);
} }
if (ao_app->casing_alerts_enabled) { if (ao_app->casing_alerts_supported) {
ui_announce_casing->show(); ui_announce_casing->show();
ui_casing->show(); ui_casing->show();
} }
@ -1512,7 +1512,7 @@ void Courtroom::update_character(int p_cid)
set_iniswap_dropdown(); set_iniswap_dropdown();
ui_custom_objection->hide(); ui_custom_objection->hide();
if (ao_app->custom_objection_enabled) // if setting is enabled if (ao_app->custom_objection_supported) // if setting is enabled
{ {
custom_obj_menu->clear(); custom_obj_menu->clear();
custom_objections_list.clear(); custom_objections_list.clear();
@ -1579,17 +1579,17 @@ void Courtroom::enter_courtroom()
set_evidence_page(); set_evidence_page();
if (ao_app->flipping_enabled) if (ao_app->flipping_supported)
ui_flip->show(); ui_flip->show();
else else
ui_flip->hide(); ui_flip->hide();
if (ao_app->additive_enabled) if (ao_app->additive_text_supported)
ui_additive->show(); ui_additive->show();
else else
ui_additive->hide(); ui_additive->hide();
if (ao_app->casing_alerts_enabled) if (ao_app->casing_alerts_supported)
ui_casing->show(); ui_casing->show();
else else
ui_casing->hide(); ui_casing->hide();
@ -1696,7 +1696,7 @@ void Courtroom::list_areas()
QString i_area = ""; QString i_area = "";
i_area.append(area_list.at(n_area)); i_area.append(area_list.at(n_area));
if (ao_app->arup_enabled) { if (ao_app->arup_supported) {
i_area.append("\n "); i_area.append("\n ");
i_area.append(arup_statuses.at(n_area)); i_area.append(arup_statuses.at(n_area));
@ -1724,7 +1724,7 @@ void Courtroom::list_areas()
treeItem->setText(0, area_list.at(n_area)); treeItem->setText(0, area_list.at(n_area));
treeItem->setText(1, i_area); treeItem->setText(1, i_area);
if (ao_app->arup_enabled) { if (ao_app->arup_supported) {
// Coloring logic here. // Coloring logic here.
treeItem->setBackground(1, free_brush); treeItem->setBackground(1, free_brush);
if (arup_locks.at(n_area) == "LOCKED") { if (arup_locks.at(n_area) == "LOCKED") {
@ -1794,7 +1794,7 @@ void Courtroom::append_server_chatmessage(QString p_name, QString p_message,
color = color =
ao_app->get_color("server_chatlog_sender_color", "courtroom_fonts.ini") ao_app->get_color("server_chatlog_sender_color", "courtroom_fonts.ini")
.name(); .name();
if (!ao_app->auth_packet_enabled && p_message == "Logged in as a moderator.") { if (!ao_app->auth_packet_supported && p_message == "Logged in as a moderator.") {
// Emulate successful authentication // Emulate successful authentication
on_authentication_state_received(1); on_authentication_state_received(1);
} }
@ -1864,10 +1864,10 @@ void Courtroom::on_chat_return_pressed()
QString f_desk_mod = "chat"; QString f_desk_mod = "chat";
if (ao_app->desk_mod_enabled) { if (ao_app->desk_mod_supported) {
f_desk_mod = f_desk_mod =
QString::number(ao_app->get_desk_mod(current_char, current_emote)); QString::number(ao_app->get_desk_mod(current_char, current_emote));
if (!ao_app->expanded_desk_mods_enabled) { if (!ao_app->expanded_desk_mods_supported) {
if (f_desk_mod == "2" || f_desk_mod == "4") if (f_desk_mod == "2" || f_desk_mod == "4")
f_desk_mod = "0"; f_desk_mod = "0";
else if (f_desk_mod == "3" || f_desk_mod == "5") else if (f_desk_mod == "3" || f_desk_mod == "5")
@ -1911,7 +1911,7 @@ void Courtroom::on_chat_return_pressed()
f_emote_mod = PREANIM; f_emote_mod = PREANIM;
} }
// Turn zoom into preanim zoom // Turn zoom into preanim zoom
else if (f_emote_mod == ZOOM && ao_app->prezoom_enabled) { else if (f_emote_mod == ZOOM && ao_app->prezoom_supported) {
f_emote_mod = PREANIM_ZOOM; f_emote_mod = PREANIM_ZOOM;
} }
// Play the sfx // Play the sfx
@ -1947,7 +1947,7 @@ void Courtroom::on_chat_return_pressed()
QString f_obj_state; QString f_obj_state;
if ((objection_state == 4 && !ao_app->custom_objection_enabled) || if ((objection_state == 4 && !ao_app->custom_objection_supported) ||
(objection_state < 0)) (objection_state < 0))
f_obj_state = "0"; f_obj_state = "0";
else if (objection_custom != "" && objection_state == 4) { else if (objection_custom != "" && objection_state == 4) {
@ -1973,7 +1973,7 @@ void Courtroom::on_chat_return_pressed()
QString f_flip; QString f_flip;
if (ao_app->flipping_enabled) { if (ao_app->flipping_supported) {
if (ui_flip->isChecked()) if (ui_flip->isChecked())
f_flip = "1"; f_flip = "1";
else else
@ -1998,7 +1998,7 @@ void Courtroom::on_chat_return_pressed()
packet_contents.append(f_text_color); packet_contents.append(f_text_color);
// If the server we're on supports CCCC stuff, we should use it! // If the server we're on supports CCCC stuff, we should use it!
if (ao_app->cccc_ic_support_enabled) { if (ao_app->cccc_ic_supported) {
// If there is a showname entered, use that -- else, just send an empty // If there is a showname entered, use that -- else, just send an empty
// packet-part. // packet-part.
if (!ui_ic_chat_name->text().isEmpty()) { if (!ui_ic_chat_name->text().isEmpty()) {
@ -2012,7 +2012,7 @@ void Courtroom::on_chat_return_pressed()
// ourselves. Or a charid of -1 or lower, through some means. // ourselves. Or a charid of -1 or lower, through some means.
if (other_charid > -1 && other_charid != m_cid) { if (other_charid > -1 && other_charid != m_cid) {
QString packet = QString::number(other_charid); QString packet = QString::number(other_charid);
if (ao_app->effects_enabled) // Only servers with effects enabled will if (ao_app->effects_supported) // Only servers with effects enabled will
// support pair reordering // support pair reordering
packet += "^" + QString::number(pair_order); packet += "^" + QString::number(pair_order);
packet_contents.append(packet); packet_contents.append(packet);
@ -2021,7 +2021,7 @@ void Courtroom::on_chat_return_pressed()
packet_contents.append("-1"); packet_contents.append("-1");
} }
// Send the offset as it's gonna be used regardless // Send the offset as it's gonna be used regardless
if(ao_app->y_offset_enabled) if(ao_app->y_offset_supported)
packet_contents.append(QString::number(char_offset) + "&" + QString::number(char_vert_offset)); packet_contents.append(QString::number(char_offset) + "&" + QString::number(char_vert_offset));
else else
packet_contents.append(QString::number(char_offset)); packet_contents.append(QString::number(char_offset));
@ -2037,7 +2037,7 @@ void Courtroom::on_chat_return_pressed()
// If the server we're on supports Looping SFX and Screenshake, use it if the // If the server we're on supports Looping SFX and Screenshake, use it if the
// emote uses it. // emote uses it.
if (ao_app->looping_sfx_support_enabled) { if (ao_app->looping_sfx_supported) {
packet_contents.append( packet_contents.append(
ao_app->get_sfx_looping(current_char, current_emote)); ao_app->get_sfx_looping(current_char, current_emote));
packet_contents.append(QString::number(screenshake_state)); packet_contents.append(QString::number(screenshake_state));
@ -2068,10 +2068,10 @@ void Courtroom::on_chat_return_pressed()
} }
} }
if (ao_app->additive_enabled) { if (ao_app->additive_text_supported) {
packet_contents.append(ui_additive->isChecked() ? "1" : "0"); packet_contents.append(ui_additive->isChecked() ? "1" : "0");
} }
if (ao_app->effects_enabled) { if (ao_app->effects_supported) {
QString fx_sound = QString fx_sound =
ao_app->get_effect_property(effect, current_char, "sound"); ao_app->get_effect_property(effect, current_char, "sound");
QString p_effect = QString p_effect =
@ -2217,7 +2217,7 @@ void Courtroom::unpack_chatmessage(QStringList p_contents)
// supports CCCC's IC features, or if it's just japing us. Also, don't // supports CCCC's IC features, or if it's just japing us. Also, don't
// forget! A size 15 message will have indices from 0 to 14. // forget! A size 15 message will have indices from 0 to 14.
if (n_string < p_contents.size() && if (n_string < p_contents.size() &&
(n_string < MS_MINIMUM || ao_app->cccc_ic_support_enabled)) { (n_string < MS_MINIMUM || ao_app->cccc_ic_supported)) {
m_chatmessage[n_string] = p_contents.at(n_string); m_chatmessage[n_string] = p_contents.at(n_string);
} }
else { else {
@ -2512,7 +2512,7 @@ void Courtroom::display_pair_character(QString other_charid, QString other_offse
} }
} }
// Flip the pair character // Flip the pair character
if (ao_app->flipping_enabled && m_chatmessage[OTHER_FLIP].toInt() == 1) if (ao_app->flipping_supported && m_chatmessage[OTHER_FLIP].toInt() == 1)
ui_vp_sideplayer_char->set_flipped(true); ui_vp_sideplayer_char->set_flipped(true);
else else
ui_vp_sideplayer_char->set_flipped(false); ui_vp_sideplayer_char->set_flipped(false);
@ -4150,7 +4150,7 @@ void Courtroom::on_ooc_return_pressed()
//We ignore it when the server is compatible with 2.8 //We ignore it when the server is compatible with 2.8
//Using an arbitrary 2.8 feature flag certainly won't cause issues someday. //Using an arbitrary 2.8 feature flag certainly won't cause issues someday.
if (ooc_message.startsWith("/pos") && !ao_app->effects_enabled) { if (ooc_message.startsWith("/pos") & !ao_app->effects_supported) {
if (ooc_message == "/pos jud") { if (ooc_message == "/pos jud") {
show_judge_controls(true); show_judge_controls(true);
} }
@ -4876,10 +4876,10 @@ void Courtroom::on_music_list_double_clicked(QTreeWidgetItem *p_item,
QStringList packet_contents; QStringList packet_contents;
packet_contents.append(p_song); packet_contents.append(p_song);
packet_contents.append(QString::number(m_cid)); packet_contents.append(QString::number(m_cid));
if ((!ui_ic_chat_name->text().isEmpty() && ao_app->cccc_ic_support_enabled) || if ((!ui_ic_chat_name->text().isEmpty() && ao_app->cccc_ic_supported) ||
ao_app->effects_enabled) ao_app->effects_supported)
packet_contents.append(ui_ic_chat_name->text()); packet_contents.append(ui_ic_chat_name->text());
if (ao_app->effects_enabled) if (ao_app->effects_supported)
packet_contents.append(QString::number(music_flags)); packet_contents.append(QString::number(music_flags));
ao_app->send_server_packet(new AOPacket("MC", packet_contents), false); ao_app->send_server_packet(new AOPacket("MC", packet_contents), false);
} }
@ -4991,10 +4991,10 @@ void Courtroom::music_stop(bool no_effects)
packet_contents.append( packet_contents.append(
fake_song); // this is our fake song, playing it triggers special code fake_song); // this is our fake song, playing it triggers special code
packet_contents.append(QString::number(m_cid)); packet_contents.append(QString::number(m_cid));
if ((!ui_ic_chat_name->text().isEmpty() && ao_app->cccc_ic_support_enabled) || if ((!ui_ic_chat_name->text().isEmpty() && ao_app->cccc_ic_supported) ||
ao_app->effects_enabled) ao_app->effects_supported)
packet_contents.append(ui_ic_chat_name->text()); packet_contents.append(ui_ic_chat_name->text());
if (ao_app->effects_enabled) { if (ao_app->effects_supported) {
if (no_effects) if (no_effects)
packet_contents.append("0"); packet_contents.append("0");
else else
@ -5166,7 +5166,7 @@ void Courtroom::on_pair_clicked()
if (ui_pair_list->isHidden()) { if (ui_pair_list->isHidden()) {
ui_pair_list->show(); ui_pair_list->show();
ui_pair_offset_spinbox->show(); ui_pair_offset_spinbox->show();
if(ao_app->y_offset_enabled) if(ao_app->y_offset_supported)
ui_pair_vert_offset_spinbox->show(); ui_pair_vert_offset_spinbox->show();
ui_pair_order_dropdown->show(); ui_pair_order_dropdown->show();
ui_mute_list->hide(); ui_mute_list->hide();
@ -5437,7 +5437,7 @@ void Courtroom::on_spectator_clicked() { char_clicked(-1); }
void Courtroom::on_call_mod_clicked() void Courtroom::on_call_mod_clicked()
{ {
if (ao_app->modcall_reason_enabled) { if (ao_app->modcall_reason_supported) {
QMessageBox errorBox; QMessageBox errorBox;
QInputDialog input; QInputDialog input;
@ -5564,7 +5564,7 @@ qint64 Courtroom::pong()
void Courtroom::on_casing_clicked() void Courtroom::on_casing_clicked()
{ {
if (ao_app->casing_alerts_enabled) { if (ao_app->casing_alerts_supported) {
if (ui_casing->isChecked()) { if (ui_casing->isChecked()) {
QStringList f_packet; QStringList f_packet;
@ -5587,7 +5587,7 @@ void Courtroom::on_casing_clicked()
void Courtroom::announce_case(QString title, bool def, bool pro, bool jud, void Courtroom::announce_case(QString title, bool def, bool pro, bool jud,
bool jur, bool steno) bool jur, bool steno)
{ {
if (ao_app->casing_alerts_enabled) { if (ao_app->casing_alerts_supported) {
QStringList f_packet; QStringList f_packet;
f_packet.append(title); f_packet.append(title);

92
src/packet_distribution.cpp
View File

@ -39,20 +39,20 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
goto end; goto end;
// default(legacy) values // default(legacy) values
yellow_text_enabled = false; yellow_text_supported = false;
prezoom_enabled = false; prezoom_supported = false;
flipping_enabled = false; flipping_supported = false;
custom_objection_enabled = false; custom_objection_supported = false;
desk_mod_enabled = false; desk_mod_supported = false;
evidence_enabled = false; evidence_supported = false;
cccc_ic_support_enabled = false; cccc_ic_supported = false;
arup_enabled = false; arup_supported = false;
casing_alerts_enabled = false; casing_alerts_supported = false;
modcall_reason_enabled = false; modcall_reason_supported = false;
looping_sfx_support_enabled = false; looping_sfx_supported = false;
additive_enabled = false; additive_text_supported = false;
effects_enabled = false; effects_supported = false;
y_offset_enabled = false; y_offset_supported = false;
QString f_hdid; QString f_hdid;
f_hdid = get_hdid(); f_hdid = get_hdid();
@ -88,53 +88,53 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
} }
} }
else if (header == "FL") { else if (header == "FL") {
yellow_text_enabled = false; yellow_text_supported = false;
prezoom_enabled = false; prezoom_supported = false;
flipping_enabled = false; flipping_supported = false;
custom_objection_enabled = false; custom_objection_supported = false;
desk_mod_enabled = false; desk_mod_supported = false;
evidence_enabled = false; evidence_supported = false;
cccc_ic_support_enabled = false; cccc_ic_supported = false;
arup_enabled = false; arup_supported = false;
casing_alerts_enabled = false; casing_alerts_supported = false;
modcall_reason_enabled = false; modcall_reason_supported = false;
looping_sfx_support_enabled = false; looping_sfx_supported = false;
additive_enabled = false; additive_text_supported = false;
effects_enabled = false; effects_supported = false;
expanded_desk_mods_enabled = false; expanded_desk_mods_supported = false;
auth_packet_enabled = false; auth_packet_supported = false;
if (f_packet.contains("yellowtext", Qt::CaseInsensitive)) if (f_packet.contains("yellowtext", Qt::CaseInsensitive))
yellow_text_enabled = true; yellow_text_supported = true;
if (f_packet.contains("prezoom", Qt::CaseInsensitive)) if (f_packet.contains("prezoom", Qt::CaseInsensitive))
prezoom_enabled = true; prezoom_supported = true;
if (f_packet.contains("flipping", Qt::CaseInsensitive)) if (f_packet.contains("flipping", Qt::CaseInsensitive))
flipping_enabled = true; flipping_supported = true;
if (f_packet.contains("customobjections", Qt::CaseInsensitive)) if (f_packet.contains("customobjections", Qt::CaseInsensitive))
custom_objection_enabled = true; custom_objection_supported = true;
if (f_packet.contains("deskmod", Qt::CaseInsensitive)) if (f_packet.contains("deskmod", Qt::CaseInsensitive))
desk_mod_enabled = true; desk_mod_supported = true;
if (f_packet.contains("evidence", Qt::CaseInsensitive)) if (f_packet.contains("evidence", Qt::CaseInsensitive))
evidence_enabled = true; evidence_supported = true;
if (f_packet.contains("cccc_ic_support", Qt::CaseInsensitive)) if (f_packet.contains("cccc_ic_support", Qt::CaseInsensitive))
cccc_ic_support_enabled = true; cccc_ic_supported = true;
if (f_packet.contains("arup", Qt::CaseInsensitive)) if (f_packet.contains("arup", Qt::CaseInsensitive))
arup_enabled = true; arup_supported = true;
if (f_packet.contains("casing_alerts", Qt::CaseInsensitive)) if (f_packet.contains("casing_alerts", Qt::CaseInsensitive))
casing_alerts_enabled = true; casing_alerts_supported = true;
if (f_packet.contains("modcall_reason", Qt::CaseInsensitive)) if (f_packet.contains("modcall_reason", Qt::CaseInsensitive))
modcall_reason_enabled = true; modcall_reason_supported = true;
if (f_packet.contains("looping_sfx", Qt::CaseInsensitive)) if (f_packet.contains("looping_sfx", Qt::CaseInsensitive))
looping_sfx_support_enabled = true; looping_sfx_supported = true;
if (f_packet.contains("additive", Qt::CaseInsensitive)) if (f_packet.contains("additive", Qt::CaseInsensitive))
additive_enabled = true; additive_text_supported = true;
if (f_packet.contains("effects", Qt::CaseInsensitive)) if (f_packet.contains("effects", Qt::CaseInsensitive))
effects_enabled = true; effects_supported = true;
if (f_packet.contains("y_offset", Qt::CaseInsensitive)) if (f_packet.contains("y_offset", Qt::CaseInsensitive))
y_offset_enabled = true; y_offset_supported = true;
if (f_packet.contains("expanded_desk_mods", Qt::CaseInsensitive)) if (f_packet.contains("expanded_desk_mods", Qt::CaseInsensitive))
expanded_desk_mods_enabled = true; expanded_desk_mods_supported = true;
if (f_packet.contains("auth_packet", Qt::CaseInsensitive)) if (f_packet.contains("auth_packet", Qt::CaseInsensitive))
auth_packet_enabled = true; auth_packet_supported = true;
} }
else if (header == "PN") { else if (header == "PN") {
if (f_contents.size() < 2) if (f_contents.size() < 2)
@ -603,7 +603,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
} }
// Auth packet // Auth packet
else if (header == "AUTH") { else if (header == "AUTH") {
if (!courtroom_constructed || !auth_packet_enabled || f_contents.size() < 1) if (!courtroom_constructed || !auth_packet_supported || f_contents.size() < 1)
goto end; goto end;
bool ok; bool ok;
int authenticated = f_contents.at(0).toInt(&ok); int authenticated = f_contents.at(0).toInt(&ok);