Merge pull request #217 from AttorneyOnline/kfo-ao2

Final mega-merge with the Killing Fever Online client, along with other associated bugfixes and feature additions.

This commit is release-ready.

1 files changed, 16 insertions, 0 deletions

diff --git a/include/aoscene.h b/include/aoscene.h
index 7c1ef6fd..726e2641 100644
--- a/include/aoscene.h
+++ b/include/aoscene.h
@@ -16,11 +16,27 @@ public:
   void set_image(QString p_image);
   void set_legacy_desk(QString p_image);
 
+  // Move the label itself around
+  void move(int ax, int ay);
+
+  // This is somewhat pointless now as there's no "QMovie" object to resize, aka
+  // no "combo" to speak of
+  void combo_resize(int w, int h);
+
 private:
   QWidget *m_parent;
   QMovie *m_movie;
   AOApplication *ao_app;
   QString last_image;
+
+  // These are the X and Y values before they are fixed based on the sprite's
+  // width.
+  int x = 0;
+  int y = 0;
+  // These are the width and height values before they are fixed based on the
+  // sprite's width.
+  int f_w = 0;
+  int f_h = 0;
 };
 
 #endif // AOSCENE_H