diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/aooptionsdialog.cpp | 17 | ||||
| -rw-r--r-- | src/courtroom.cpp | 19 | ||||
| -rw-r--r-- | src/text_file_functions.cpp | 6 |
3 files changed, 33 insertions, 9 deletions
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index ef7cb2f..5a196fb 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -221,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( @@ -234,6 +249,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) 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); @@ -840,6 +856,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/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/text_file_functions.cpp b/src/text_file_functions.cpp index 0128f56..02d4537 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(); |