Merge branch 'master' into music_list_update

1 files changed, 62 insertions, 1 deletions

diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 5a34ac8..1e1c474 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -8,7 +8,7 @@ QString AOApplication::read_theme()
 
 int AOApplication::read_blip_rate()
 {
-  int result = configini->value("blip_rate", 1).toInt();
+  int result = configini->value("blip_rate", 2).toInt();
 
   if (result < 1)
     return 1;
@@ -568,6 +568,42 @@ QString AOApplication::get_sfx_name(QString p_char, int p_emote)
   else return f_result;
 }
 
+QString AOApplication::get_sfx_looping(QString p_char, int p_emote)
+{
+  QString f_result = read_char_ini(p_char, QString::number(p_emote + 1), "SoundL");
+
+  if (f_result == "")
+    return "0";
+  else return f_result;
+}
+
+QString AOApplication::get_frame_sfx_name(QString p_char, QString p_emote, int n_frame)
+{
+  QString f_result = read_char_ini(p_char, QString::number(n_frame), p_emote.append("_FrameSFX"));
+  if (f_result == "")
+    return "";
+  else return f_result;
+}
+
+QString AOApplication::get_screenshake_frame(QString p_char, QString p_emote, int n_frame)
+{
+  QString f_result = read_char_ini(p_char, QString::number(n_frame), p_emote.append("_FrameScreenshake"));
+  if (f_result == "")
+    return "";
+  else return f_result;
+}
+
+
+QString AOApplication::get_realization_frame(QString p_char, QString p_emote, int n_frame)
+{
+  QString f_result = read_char_ini(p_char, QString::number(n_frame), p_emote.append("_FrameRealization"));
+  if (f_result == "")
+    return "";
+  else return f_result;
+}
+
+
+
 int AOApplication::get_sfx_delay(QString p_char, int p_emote)
 {
   QString f_result = read_char_ini(p_char, QString::number(p_emote + 1), "SoundT");
@@ -601,12 +637,31 @@ bool AOApplication::get_blank_blip()
     return result.startsWith("true");
 }
 
+bool AOApplication::get_looping_sfx()
+{
+    QString result = configini->value("looping_sfx", "true").value<QString>();
+    return result.startsWith("true");
+}
+
+bool AOApplication::get_objectmusic()
+{
+    QString result = configini->value("kill_music_on_object", "false").value<QString>();
+    return result.startsWith("true");
+}
+
 bool AOApplication::is_discord_enabled()
 {
     QString result = configini->value("discord", "true").value<QString>();
     return result.startsWith("true");
 }
 
+bool AOApplication::is_shakeandflash_enabled()
+{
+    QString result = configini->value("shakeandflash", "true").value<QString>();
+    return result.startsWith("true");
+}
+
+
 bool AOApplication::get_casing_enabled()
 {
     QString result = configini->value("casing_enabled", "false").value<QString>();
@@ -643,6 +698,12 @@ bool AOApplication::get_casing_steno_enabled()
   return result.startsWith("true");
 }
 
+bool AOApplication::get_casing_wit_enabled()
+{
+  QString result = configini->value("casing_wit_enabled", "false").value<QString>();
+  return result.startsWith("true");
+}
+
 bool AOApplication::get_casing_cm_enabled()
 {
     QString result = configini->value("casing_cm_enabled", "false").value<QString>();