1 files changed, 12 insertions, 31 deletions

diff --git a/include/aocharmovie.h b/include/aocharmovie.h
index f62820b9..7ef7da3f 100644
--- a/include/aocharmovie.h
+++ b/include/aocharmovie.h
@@ -1,17 +1,16 @@
 #ifndef AOCHARMOVIE_H
 #define AOCHARMOVIE_H
 
-#include "include/aosfxplayer.h"
-#include "include/courtroom.h"
-#include <QDebug>
-#include <QImageReader>
-#include <QLabel>
 #include <QMovie>
-#include <QPainter>
+#include <QLabel>
 #include <QTimer>
+#include <QDebug>
+#include <QImageReader>
 
 class AOApplication;
-class AOCharMovie : public QLabel {
+
+class AOCharMovie : public QLabel
+{
   Q_OBJECT
 
 public:
@@ -22,24 +21,12 @@ public:
   void play_talking(QString p_char, QString p_emote);
   void play_idle(QString p_char, QString p_emote);
 
-  void set_flipped(bool p_flipped) { m_flipped = p_flipped; }
-  void LoadImageWithStupidMethodForFlipSupport(QImage image);
-  void stop();
-
-  void play_frame_sfx();
-
-  void sfx_two_network_boogaloo();
-  void screenshake_two_network_boogaloo();
-  void realization_two_network_boogaloo();
+  void set_flipped(bool p_flipped) {m_flipped = p_flipped;}
 
-  AOSfxPlayer *frame_specific_sfx_player;
-  Courtroom *mycourtroom;
-  QString frame_sfx_hellstring = "";
-  QString frame_screenshake_hellstring = "";
-  QString frame_realization_hellstring = "";
-  bool use_networked_framehell = false;
+  void stop();
 
   void move(int ax, int ay);
+
   void combo_resize(int w, int h);
 
 private:
@@ -48,17 +35,10 @@ private:
   QMovie *m_movie;
   QVector<QImage> movie_frames;
   QTimer *preanim_timer;
-  QTimer *ticker;
-  QString last_path;
-  QString current_emote;
-  QString current_char;
-  int default_w;
-  int default_h;
 
   const int time_mod = 62;
 
-  // These are the X and Y values before they are fixed based on the sprite's
-  // width.
+  // These are the X and Y values before they are fixed based on the sprite's width.
   int x = 0;
   int y = 0;
 
@@ -70,7 +50,8 @@ signals:
   void done();
 
 private slots:
+  void frame_change(int n_frame);
   void timer_done();
-  void movie_ticker();
 };
+
 #endif // AOCHARMOVIE_H