From d135bbc51144667fb3ee323a7635e3dbfc3f41a8 Mon Sep 17 00:00:00 2001
From: TrickyLeifa <date.epoch@gmail.com>
Date: Wed, 22 May 2024 23:30:31 +0200
Subject: 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.
---
 src/animationlayer.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/animationlayer.h')

diff --git a/src/animationlayer.h b/src/animationlayer.h
index da64354a..c67f7026 100644
--- a/src/animationlayer.h
+++ b/src/animationlayer.h
@@ -90,6 +90,7 @@ private:
   bool m_flipped = false;
   int m_minimum_duration = 0;
   int m_maximum_duration = 0;
+  Qt::TransformationMode m_transformation_mode_hint = Qt::FastTransformation;
   Qt::TransformationMode m_transformation_mode = Qt::FastTransformation;
   AnimationLoader *m_loader = nullptr;
   QSize m_frame_size;
@@ -103,6 +104,7 @@ private:
   QTimer *m_ticker = nullptr;
   bool m_first_frame = false;
   int m_frame_number = 0;
+  int m_target_frame_number = -1;
   int m_frame_count = 0;
   AnimationFrame m_current_frame;
 
@@ -170,6 +172,7 @@ private:
 
   QString m_character;
   QString m_emote;
+  QString m_resolved_emote;
   EmoteType m_emote_type = NoEmoteType;
   QTimer *m_duration_timer = nullptr;
   int m_duration = 0;
-- 
cgit