Merge pull request #438 from AttorneyOnline/feature/textspeed

Text crawl setting

3 files changed, 7 insertions, 1 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index c217dad..8b248cc 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -229,6 +229,9 @@ public:
   // Current wait time between messages for the queue system
   int stay_time();
 
+  // Returns the letter display speed during text crawl in in-character messages
+  int get_text_crawl();
+
   // Returns Minimum amount of time (in miliseconds) that must pass before the next Enter key press will send your IC message. (new behaviour)
   int get_chat_ratelimit();
 
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 74fc9af..908d918 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -58,6 +58,8 @@ private:
   QCheckBox *ui_desync_logs_cb;
   QLabel *ui_instant_objection_lbl;
   QCheckBox *ui_instant_objection_cb;
+  QLabel *ui_text_crawl_lbl;
+  QSpinBox *ui_text_crawl_spinbox;
   QLabel *ui_chat_ratelimit_lbl;
   QSpinBox *ui_chat_ratelimit_spinbox;
   QLabel *ui_log_ic_actions_lbl;
diff --git a/include/courtroom.h b/include/courtroom.h
index bf33581..fe3a171 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -336,7 +336,8 @@ private:
   bool message_is_centered = false;
 
   int current_display_speed = 3;
-  int message_display_speed[7] = {5, 10, 25, 40, 50, 70, 90};
+  int text_crawl = 40;
+  double message_display_mult[7] = {0.125, 0.25, 0.65, 1, 1.25, 1.75, 2.25};
 
   // The character ID of the character this user wants to appear alongside with.
   int other_charid = -1;