Merge pull request #117 from AttorneyOnline/2.7

2.7

1 files changed, 25 insertions, 6 deletions

diff --git a/include/aocharmovie.h b/include/aocharmovie.h
index 7ef7da3..6c127a6 100644
--- a/include/aocharmovie.h
+++ b/include/aocharmovie.h
@@ -6,9 +6,12 @@
 #include <QTimer>
 #include <QDebug>
 #include <QImageReader>
+#include <QPainter>
+#include "include/aosfxplayer.h"
+#include "include/courtroom.h"
 
-class AOApplication;
 
+class AOApplication;
 class AOCharMovie : public QLabel
 {
   Q_OBJECT
@@ -22,36 +25,52 @@ public:
   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 move(int ax, int ay);
-
   void combo_resize(int w, int h);
-
+  void play_frame_sfx();
+
+  void sfx_two_network_boogaloo();
+  void screenshake_two_network_boogaloo();
+  void realization_two_network_boogaloo();
+
+  AOSfxPlayer *frame_specific_sfx_player;
+  Courtroom *mycourtroom;
+  QString frame_sfx_hellstring = "";
+  QString frame_screenshake_hellstring = "";
+  QString frame_realization_hellstring = "";
+  bool use_networked_framehell = false;
 private:
   AOApplication *ao_app;
 
   QMovie *m_movie;
   QVector<QImage> movie_frames;
   QTimer *preanim_timer;
+  QTimer *ticker;
+  QString last_path;
+  QString current_emote;
+  QString current_char;
 
   const int time_mod = 62;
 
   // These are the X and Y values before they are fixed based on the sprite's width.
   int x = 0;
   int y = 0;
+  int default_w;
+  int default_h;
 
   bool m_flipped = false;
 
   bool play_once = true;
+  bool apng = false;
 
 signals:
   void done();
 
 private slots:
-  void frame_change(int n_frame);
   void timer_done();
+  void movie_ticker();
 };
-
 #endif // AOCHARMOVIE_H