Fixed emote synchronization, ...

* Fixed emote synchronization
  * Still requires identical frame count. Will still cause freeze as it syncs.
* Fixed frame effects not working on idle and talk emotes.
* Characters are now repositioned after background sliding is over.

1 files changed, 11 insertions, 3 deletions

diff --git a/src/path_functions.cpp b/src/path_functions.cpp
index 4ab5c660..4d22e9b9 100644
--- a/src/path_functions.cpp
+++ b/src/path_functions.cpp
@@ -239,19 +239,27 @@ QString AOApplication::get_asset_path(QVector<VPath> pathlist)
   return QString();
 }
 
-QString AOApplication::get_image_path(QVector<VPath> pathlist, bool static_image)
+QString AOApplication::get_image_path(QVector<VPath> pathlist, int &index, bool static_image)
 {
-  for (const VPath &p : pathlist)
+  for (int i = 0; i < pathlist.size(); i++)
   {
-    QString path = get_image_suffix(p, static_image);
+    QString path = get_image_suffix(pathlist[i], static_image);
     if (!path.isEmpty())
     {
+      index = i;
       return path;
     }
   }
+
   return QString();
 }
 
+QString AOApplication::get_image_path(QVector<VPath> pathlist, bool static_image)
+{
+  int dummy;
+  return get_image_path(pathlist, dummy, static_image);
+}
+
 QString AOApplication::get_sfx_path(QVector<VPath> pathlist)
 {
   for (const VPath &p : pathlist)