Merge pull request #542 from AttorneyOnline/fix/aolayer-crap

Fix AOLayer-related regressions, deprecate BS no one uses and return sane behavior

2 files changed, 0 insertions, 8 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 16bbb9f2..725f2bba 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -378,10 +378,6 @@ public:
   // Returns the preanim duration of p_char's p_emote
   int get_preanim_duration(QString p_char, QString p_emote);
 
-  // Same as above, but only returns if it has a % in front(refer to Preanims
-  // section in the manual)
-  int get_ao2_preanim_duration(QString p_char, QString p_emote);
-
   // Not in use
   int get_text_delay(QString p_char, QString p_emote);
 
diff --git a/include/aolayer.h b/include/aolayer.h
index f42642cd..f3ecebfb 100644
--- a/include/aolayer.h
+++ b/include/aolayer.h
@@ -104,10 +104,6 @@ protected:
 
   QElapsedTimer actual_time;
 
-  // Usually used to turn seconds into milliseconds such as for [Time] tag in
-  // char.ini (which is no longer used)
-  const int tick_ms = 60;
-
   // These are the X and Y values before they are fixed based on the sprite's
   // width.
   int x = 0;