Merge branch 'master' into feature/timerclock

# Conflicts:
#	include/courtroom.h

1 files changed, 19 insertions, 1 deletions

diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 3524d87e..1ea27bff 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -46,6 +46,12 @@ int AOApplication::get_max_log_size()
   return result;
 }
 
+int AOApplication::stay_time()
+{
+  int result = configini->value("stay_time", 200).toInt();
+  return result;
+}
+
 bool AOApplication::get_log_goes_downwards()
 {
   QString result =
@@ -854,7 +860,7 @@ QString AOApplication::get_flash_frame(QString p_char, QString p_emote,
 
 int AOApplication::get_text_delay(QString p_char, QString p_emote)
 {
-  QString f_result = read_char_ini(p_char, p_emote, "TextDelay");
+  QString f_result = read_char_ini(p_char, p_emote, "stay_time");
 
   if (f_result == "")
     return -1;
@@ -979,6 +985,18 @@ bool AOApplication::objection_stop_music()
   return result.startsWith("true");
 }
 
+bool AOApplication::is_instant_objection_enabled()
+{
+  QString result = configini->value("instant_objection", "true").value<QString>();
+  return result.startsWith("true");
+}
+
+bool AOApplication::is_desyncrhonized_logs_enabled()
+{
+  QString result = configini->value("desync_logs", "false").value<QString>();
+  return result.startsWith("true");
+}
+
 bool AOApplication::is_discord_enabled()
 {
   QString result = configini->value("discord", "true").value<QString>();