diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/aooptionsdialog.cpp | 36 | ||||
| -rw-r--r-- | src/aopacket.cpp | 27 | ||||
| -rw-r--r-- | src/charselect.cpp | 4 | ||||
| -rw-r--r-- | src/courtroom.cpp | 19 | ||||
| -rw-r--r-- | src/packet_distribution.cpp | 9 | ||||
| -rw-r--r-- | src/text_file_functions.cpp | 6 |
6 files changed, 72 insertions, 29 deletions
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index bfc0ab6..2f7e854 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -8,18 +8,18 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ao_app = p_ao_app; // Setting up the basics. - // setAttribute(Qt::WA_DeleteOnClose); + setWindowFlag(Qt::WindowCloseButtonHint); setWindowTitle(tr("Settings")); - resize(398, 320); + resize(400, 408); ui_settings_buttons = new QDialogButtonBox(this); - QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::MinimumExpanding); + QSizePolicy sizePolicy1(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); sizePolicy1.setHeightForWidth( ui_settings_buttons->sizePolicy().hasHeightForWidth()); - ui_settings_buttons->setSizePolicy(sizePolicy1); + ui_settings_buttons->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum)); ui_settings_buttons->setOrientation(Qt::Horizontal); ui_settings_buttons->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Save); @@ -45,7 +45,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_gameplay_tab->setSizePolicy(sizePolicy1); ui_settings_tabs->addTab(ui_gameplay_tab, tr("Gameplay")); ui_form_layout_widget = new QWidget(ui_gameplay_tab); - ui_form_layout_widget->setGeometry(QRect(10, 10, 361, 361)); ui_form_layout_widget->setSizePolicy(sizePolicy1); ui_gameplay_form = new QFormLayout(ui_form_layout_widget); @@ -54,7 +53,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_gameplay_form->setFormAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop); ui_gameplay_form->setContentsMargins(0, 0, 0, 0); - ui_gameplay_form->setSpacing(2); + ui_gameplay_form->setSpacing(4); int row = 0; @@ -109,12 +108,13 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_length_lbl = new QLabel(ui_form_layout_widget); ui_length_lbl->setText(tr("Log length:")); ui_length_lbl->setToolTip(tr( - "The amount of messages the IC chatlog will keep before " - "deleting older messages. A value of 0 or below counts as 'infinite'.")); + "The amount of message lines the IC chatlog will keep before " + "deleting older message lines. A value of 0 or below counts as 'infinite'.")); ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_length_lbl); ui_length_spinbox = new QSpinBox(ui_form_layout_widget); + ui_length_spinbox->setSuffix(" lines"); ui_length_spinbox->setMaximum(10000); ui_length_spinbox->setValue(p_ao_app->get_max_log_size()); @@ -145,6 +145,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_log_margin_lbl); ui_log_margin_spinbox = new QSpinBox(ui_form_layout_widget); + ui_log_margin_spinbox->setSuffix(" px"); ui_log_margin_spinbox->setMaximum(1000); ui_log_margin_spinbox->setValue(p_ao_app->get_log_margin()); @@ -187,6 +188,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_stay_time_lbl); ui_stay_time_spinbox = new QSpinBox(ui_form_layout_widget); + ui_stay_time_spinbox->setSuffix(" ms"); ui_stay_time_spinbox->setMaximum(10000); ui_stay_time_spinbox->setValue(p_ao_app->stay_time()); @@ -219,6 +221,21 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_instant_objection_cb); row += 1; + ui_text_crawl_lbl = new QLabel(ui_form_layout_widget); + ui_text_crawl_lbl->setText(tr("Text crawl:")); + ui_text_crawl_lbl->setToolTip(tr( + "Amount of time (in miliseconds) spent on each letter when the in-character text is being displayed.")); + + ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_text_crawl_lbl); + + ui_text_crawl_spinbox = new QSpinBox(ui_form_layout_widget); + ui_text_crawl_spinbox->setSuffix(" ms"); + ui_text_crawl_spinbox->setMaximum(500); + ui_text_crawl_spinbox->setValue(p_ao_app->get_text_crawl()); + + ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_text_crawl_spinbox); + + row += 1; ui_chat_ratelimit_lbl = new QLabel(ui_form_layout_widget); ui_chat_ratelimit_lbl->setText(tr("Chat Rate Limit:")); ui_chat_ratelimit_lbl->setToolTip(tr( @@ -227,10 +244,12 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_chat_ratelimit_lbl); ui_chat_ratelimit_spinbox = new QSpinBox(ui_form_layout_widget); + ui_chat_ratelimit_spinbox->setSuffix(" ms"); ui_chat_ratelimit_spinbox->setMaximum(5000); ui_chat_ratelimit_spinbox->setValue(p_ao_app->get_chat_ratelimit()); ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_chat_ratelimit_spinbox); + row += 1; ui_log_names_divider = new QFrame(ui_form_layout_widget); ui_log_names_divider->setFrameShape(QFrame::HLine); @@ -850,6 +869,7 @@ void AOOptionsDialog::save_pressed() configini->setValue("desync_logs", ui_desync_logs_cb->isChecked()); configini->setValue("stay_time", ui_stay_time_spinbox->value()); configini->setValue("instant_objection", ui_instant_objection_cb->isChecked()); + configini->setValue("text_crawl", ui_text_crawl_spinbox->value()); configini->setValue("chat_ratelimit", ui_chat_ratelimit_spinbox->value()); configini->setValue("default_username", ui_username_textbox->text()); configini->setValue("show_custom_shownames", ui_showname_cb->isChecked()); diff --git a/src/aopacket.cpp b/src/aopacket.cpp index a40d2ef..8f4a6e3 100644 --- a/src/aopacket.cpp +++ b/src/aopacket.cpp @@ -12,25 +12,34 @@ QString AOPacket::to_string(bool encoded) { QStringList contents = m_contents; if (encoded) - contents.replaceInStrings("#", "<num>") - .replaceInStrings("%", "<percent>") - .replaceInStrings("$", "<dollar>") - .replaceInStrings("&", "<and>"); + escape(contents); return m_header + "#" + contents.join("#") + "#%"; } void AOPacket::net_encode() { - m_contents.replaceInStrings("#", "<num>") - .replaceInStrings("%", "<percent>") - .replaceInStrings("$", "<dollar>") - .replaceInStrings("&", "<and>"); + escape(m_contents); } void AOPacket::net_decode() { - m_contents.replaceInStrings("<num>", "#") + unescape(m_contents); +} + +void AOPacket::escape(QStringList &contents) +{ + contents.replaceInStrings("#", "<num>") + .replaceInStrings("%", "<percent>") + .replaceInStrings("$", "<dollar>") + .replaceInStrings("&", "<and>"); + +} + +void AOPacket::unescape(QStringList &contents) +{ + contents.replaceInStrings("<num>", "#") .replaceInStrings("<percent>", "%") .replaceInStrings("<dollar>", "$") .replaceInStrings("<and>", "&"); + } diff --git a/src/charselect.cpp b/src/charselect.cpp index abed095..1356f24 100644 --- a/src/charselect.cpp +++ b/src/charselect.cpp @@ -176,8 +176,10 @@ void Courtroom::char_clicked(int n_char) new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" + QString::number(n_char) + "#" + get_hdid() + "#%")); } - else + else { update_character(n_char); + set_widgets(); // so we don't erroneously keep the charselect's fixedSize + } if (n_char != -1) ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name); diff --git a/src/courtroom.cpp b/src/courtroom.cpp index dcc3175..0e2c280 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -467,9 +467,6 @@ void Courtroom::set_pair_list() void Courtroom::set_widgets() { - blip_rate = ao_app->read_blip_rate(); - blank_blip = ao_app->get_blank_blip(); - QString filename = "courtroom_design.ini"; pos_size_type f_courtroom = @@ -3231,6 +3228,9 @@ void Courtroom::start_chat_ticking() tick_pos = 0; blip_ticker = 0; + text_crawl = ao_app->get_text_crawl(); + blip_rate = ao_app->read_blip_rate(); + blank_blip = ao_app->get_blank_blip(); // At the start of every new message, we set the text speed to the default. current_display_speed = 3; @@ -3415,7 +3415,8 @@ void Courtroom::chat_tick() else if (current_display_speed > 6) current_display_speed = 6; - if ((message_display_speed[current_display_speed] <= 0 && + int msg_delay = text_crawl * message_display_mult[current_display_speed]; + if ((msg_delay <= 0 && tick_pos < f_message.size() - 1) || formatting_char) { chat_tick_timer->start(0); // Don't bother rendering anything out as we're @@ -3426,7 +3427,6 @@ void Courtroom::chat_tick() // scrollbar convenience } else { - int msg_delay = message_display_speed[current_display_speed]; // Do the colors, gradual showing, etc. in here QString f_message_filtered = filter_ic_text(f_message, true, tick_pos, m_chatmessage[TEXT_COLOR].toInt()); for (int c = 0; c < max_colors; ++c) { @@ -3459,7 +3459,7 @@ void Courtroom::chat_tick() // And if it's faster than that: // 40/10 = 4 b_rate = - qMax(b_rate, qRound(static_cast<float>(message_display_speed[3]) / + qMax(b_rate, qRound(static_cast<float>(text_crawl) / msg_delay)); } if (blip_ticker % b_rate == 0) { @@ -3478,9 +3478,10 @@ void Courtroom::chat_tick() // Punctuation delayer, only kicks in on speed ticks less than }} if (current_display_speed > 1 && punctuation_chars.contains(f_character)) { - // Making the user have to wait any longer than 150ms per letter is - // downright unreasonable - msg_delay = qMin(150, msg_delay * punctuation_modifier); + // Making the user have to wait any longer than 1.5 of the slowest speed + // is downright unreasonable + int max_delay = text_crawl * message_display_mult[6] * 1.5; + msg_delay = qMin(max_delay, msg_delay * punctuation_modifier); } // If this color is talking diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index 2da6981..5a093e3 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -8,9 +8,12 @@ void AOApplication::ms_packet_received(AOPacket *p_packet) { - p_packet->net_decode(); - QString header = p_packet->get_header(); + + // Some packets need to handle decode/encode separately + if (header != "SC") { + p_packet->net_decode(); + } QStringList f_contents = p_packet->get_contents(); #ifdef DEBUG_NETWORK @@ -333,6 +336,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet) for (int n_element = 0; n_element < f_contents.size(); ++n_element) { QStringList sub_elements = f_contents.at(n_element).split("&"); + AOPacket::unescape(sub_elements); + char_type f_char; f_char.name = sub_elements.at(0); if (sub_elements.size() >= 2) diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 852cb28..95a54f1 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -52,6 +52,12 @@ int AOApplication::stay_time() return result; } +int AOApplication::get_text_crawl() +{ + int result = configini->value("text_crawl", 40).toInt(); + return result; +} + int AOApplication::get_chat_ratelimit() { int result = configini->value("chat_ratelimit", 300).toInt(); |