3 files changed, 10 insertions, 8 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 493f1c92..7f7f3e12 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -278,6 +278,9 @@ public:
   // Returns whether the user would like to have custom shownames on by default.
   bool get_showname_enabled_by_default();
 
+  //Returns the showname the user may have set in config.ini.
+  QString get_default_showname();
+
   // Returns the list of words in callwords.ini
   QStringList get_call_words();
 
@@ -378,10 +381,6 @@ public:
   // Returns the preanim duration of p_char's p_emote
   int get_preanim_duration(QString p_char, QString p_emote);
 
-  // Same as above, but only returns if it has a % in front(refer to Preanims
-  // section in the manual)
-  int get_ao2_preanim_duration(QString p_char, QString p_emote);
-
   // Not in use
   int get_text_delay(QString p_char, QString p_emote);
 
@@ -490,6 +489,9 @@ public:
   // Get if the theme is animated
   bool get_animated_theme();
 
+  // Get the default scaling method
+  QString get_default_scaling();
+
   // Currently defined subtheme
   QString subtheme;
 
diff --git a/include/aolayer.h b/include/aolayer.h
index f42642cd..f3ecebfb 100644
--- a/include/aolayer.h
+++ b/include/aolayer.h
@@ -104,10 +104,6 @@ protected:
 
   QElapsedTimer actual_time;
 
-  // Usually used to turn seconds into milliseconds such as for [Time] tag in
-  // char.ini (which is no longer used)
-  const int tick_ms = 60;
-
   // These are the X and Y values before they are fixed based on the sprite's
   // width.
   int x = 0;
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index e88ce542..a6c8b8e9 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -78,6 +78,8 @@ private:
   QLabel *ui_username_lbl;
   QLabel *ui_showname_lbl;
   QCheckBox *ui_showname_cb;
+  QLabel *ui_default_showname_lbl;
+  QLineEdit *ui_default_showname_textbox;
   QFrame *ui_net_divider;
   QLabel *ui_ms_lbl;
   QLineEdit *ui_ms_textbox;
@@ -85,6 +87,8 @@ private:
   QCheckBox *ui_discord_cb;
   QLabel *ui_language_label;
   QComboBox *ui_language_combobox;
+  QLabel *ui_scaling_label;
+  QComboBox *ui_scaling_combobox;
 
   QLabel *ui_shake_lbl;
   QCheckBox *ui_shake_cb;