Merge pull request #966 from AttorneyOnline/coolslide-rebased

[Feature] Courtroom slides + major AOLayer overhaul

1 files changed, 10 insertions, 1 deletions

diff --git a/src/aoapplication.h b/src/aoapplication.h
index c2a01914..1f2b1ed0 100644
--- a/src/aoapplication.h
+++ b/src/aoapplication.h
@@ -120,16 +120,19 @@ public:
   VPath get_evidence_path(QString p_file);
   QVector<VPath> get_asset_paths(QString p_element, QString p_theme = QString(), QString p_subtheme = QString(), QString p_default_theme = QString(), QString p_misc = QString(), QString p_character = QString(), QString p_placeholder = QString());
   QString get_asset_path(QVector<VPath> pathlist);
+  QString get_image_path(QVector<VPath> pathlist, int &index, bool static_image = false);
   QString get_image_path(QVector<VPath> pathlist, bool static_image = false);
   QString get_sfx_path(QVector<VPath> pathlist);
   QString get_config_value(QString p_identifier, QString p_config, QString p_theme = QString(), QString p_subtheme = QString(), QString p_default_theme = QString(), QString p_misc = QString());
   QString get_asset(QString p_element, QString p_theme = QString(), QString p_subtheme = QString(), QString p_default_theme = QString(), QString p_misc = QString(), QString p_character = QString(), QString p_placeholder = QString());
   QString get_image(QString p_element, QString p_theme = QString(), QString p_subtheme = QString(), QString p_default_theme = QString(), QString p_misc = QString(), QString p_character = QString(), QString p_placeholder = QString(), bool static_image = false);
   QString get_sfx(QString p_sfx, QString p_misc = QString(), QString p_character = QString());
-  QString get_pos_path(const QString &pos, bool desk = false);
+  QPair<QString, QRect> get_pos_path(const QString &pos, bool desk = false);
   QString get_case_sensitive_path(QString p_file);
   QString get_real_path(const VPath &vpath, const QStringList &suffixes = {""});
 
+  QString find_image(QStringList p_list);
+
   ////// Functions for reading and writing files //////
   // Implementations file_functions.cpp
 
@@ -250,6 +253,12 @@ public:
   // Returns whether the given pos is a judge position
   bool get_pos_is_judge(const QString &p_pos);
 
+  /**
+   * @brief Returns the duration of the transition animation between the two
+   * given positions, if it exists
+   */
+  int get_pos_transition_duration(const QString &old_pos, const QString &new_pos);
+
   // Returns the total amount of emotes of p_char
   int get_emote_number(QString p_char);